xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem

Browse Source 
Conflicts:
	drivers/net/wireless/ath/ath9k/hw.c
This commit is contained in:
John W. Linville
2012-03-16 13:45:25 -04:00
parent d5ddb4a59e 377526578f
commit 01a2829809
133 changed files with 4064 additions and 3638 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
drivers/net/wireless/ipw2x00/ipw2200.h
View File

@@ -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__ */