aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/ipw2x00
diff options
context:
space:
mode:
authorJohn W. Linville <linville@tuxdriver.com>2012-03-16 13:45:25 -0400
committerJohn W. Linville <linville@tuxdriver.com>2012-03-16 13:45:25 -0400
commit01a282980937f9ca55a3cb06b9c6ff1cc49ea396 (patch)
tree07a043edc861e245a7a9764751af0898a1f1199a /drivers/net/wireless/ipw2x00
parentd5ddb4a59ed43b4c569b4efa8b508d50ef140cc6 (diff)
parent377526578f2c343ea281a918b18ece1fca65005c (diff)
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem
Conflicts: drivers/net/wireless/ath/ath9k/hw.c
Diffstat (limited to 'drivers/net/wireless/ipw2x00')
-rw-r--r--drivers/net/wireless/ipw2x00/ipw2200.h12
1 files changed, 0 insertions, 12 deletions
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 {
1997#define CFG_SYS_ANTENNA_B 0x03 /* force antenna B */ 1997#define CFG_SYS_ANTENNA_B 0x03 /* force antenna B */
1998#define CFG_SYS_ANTENNA_SLOW_DIV 0x02 /* consider background noise */ 1998#define CFG_SYS_ANTENNA_SLOW_DIV 0x02 /* consider background noise */
1999 1999
2000/*
2001 * The definitions below were lifted off the ipw2100 driver, which only
2002 * supports 'b' mode, so I'm sure these are not exactly correct.
2003 *
2004 * Somebody fix these!!
2005 */
2006#define REG_MIN_CHANNEL 0
2007#define REG_MAX_CHANNEL 14
2008
2009#define REG_CHANNEL_MASK 0x00003FFF
2010#define IPW_IBSS_11B_DEFAULT_MASK 0x87ff
2011
2012#define IPW_MAX_CONFIG_RETRIES 10 2000#define IPW_MAX_CONFIG_RETRIES 10
2013 2001
2014#endif /* __ipw2200_h__ */ 2002#endif /* __ipw2200_h__ */