renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-29 15:43:59 +08:00
Code

ath9k_htc: Fix mode selection

Browse Source 
Remove all the unsupported modes like FH, TURBO etc.
Since this requires a FW update, increase the fw version to 1.3

Signed-off-by: Sujith Manoharan <Sujith.Manoharan@atheros.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
Sujith Manoharan 2011-05-17 12:41:20 +05:30 committed by John W. Linville
parent 20ba2861b0
commit c75197a779
3 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/net/wireless/ath/ath9k/hif_usb.h
View File

@ -18,7 +18,7 @@
#define HTC_USB_H
#define MAJOR_VERSION_REQ 1
#define MINOR_VERSION_REQ 2
#define MINOR_VERSION_REQ 3
#define IS_AR7010_DEVICE(_v) (((_v) == AR9280_USB) || ((_v) == AR9287_USB))

11
drivers/net/wireless/ath/ath9k/htc.h
View File

@ -46,15 +46,8 @@ extern struct ieee80211_ops ath9k_htc_ops;
extern int htc_modparam_nohwcrypt;
enum htc_phymode {
HTC_MODE_AUTO = 0,
HTC_MODE_11A = 1,
HTC_MODE_11B = 2,
HTC_MODE_11G = 3,
HTC_MODE_FH = 4,
HTC_MODE_TURBO_A = 5,
HTC_MODE_TURBO_G = 6,
HTC_MODE_11NA = 7,
HTC_MODE_11NG = 8
HTC_MODE_11NA = 0,
HTC_MODE_11NG = 1
};
enum htc_opmode {

4
drivers/net/wireless/ath/ath9k/htc_drv_main.c
View File

@ -26,7 +26,7 @@ static enum htc_phymode ath9k_htc_get_curmode(struct ath9k_htc_priv *priv,
{
enum htc_phymode mode;
mode = HTC_MODE_AUTO;
mode = -EINVAL;
switch (ichan->chanmode) {
case CHANNEL_G:
@ -45,6 +45,8 @@ static enum htc_phymode ath9k_htc_get_curmode(struct ath9k_htc_priv *priv,
break;
}
WARN_ON(mode < 0);
return mode;
}