From: Stanislav Yakovlev Date: Fri, 9 Mar 2012 00:06:50 +0000 (-0500) Subject: net/wireless: ipw2x00: remove unused definitions for regulatory domain X-Git-Tag: firefly_0821_release~3680^2~3338^2~48^2~81 X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=138f07edb6b5a905cedf5c4fe96d6b2a45d8fb30;p=firefly-linux-kernel-4.4.55.git net/wireless: ipw2x00: remove unused definitions for regulatory domain ipw2200 driver does not use these defines, it uses geo struct instead. Therefore remove them from its header. Note: we keep them in the ipw2100 driver's header, because the driver still uses them. Signed-off-by: Stanislav Yakovlev Signed-off-by: John W. Linville --- diff --git a/drivers/net/wireless/ipw2x00/ipw2200.h b/drivers/net/wireless/ipw2x00/ipw2200.h index 66e84ec0eb55..570d6fb88967 100644 --- a/drivers/net/wireless/ipw2x00/ipw2200.h +++ b/drivers/net/wireless/ipw2x00/ipw2200.h @@ -1997,18 +1997,6 @@ struct ipw_cmd_log { #define CFG_SYS_ANTENNA_B 0x03 /* force antenna B */ #define CFG_SYS_ANTENNA_SLOW_DIV 0x02 /* consider background noise */ -/* - * The definitions below were lifted off the ipw2100 driver, which only - * supports 'b' mode, so I'm sure these are not exactly correct. - * - * Somebody fix these!! - */ -#define REG_MIN_CHANNEL 0 -#define REG_MAX_CHANNEL 14 - -#define REG_CHANNEL_MASK 0x00003FFF -#define IPW_IBSS_11B_DEFAULT_MASK 0x87ff - #define IPW_MAX_CONFIG_RETRIES 10 #endif /* __ipw2200_h__ */