Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c75197a7 authored by Sujith Manoharan's avatar Sujith Manoharan Committed by John W. Linville
Browse files

ath9k_htc: Fix mode selection 



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: default avatarSujith Manoharan <Sujith.Manoharan@atheros.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 20ba2861

drivers/net/wireless/ath/ath9k/hif_usb.h

+1 −1
Original line number Diff line number Diff line
@@ -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))

drivers/net/wireless/ath/ath9k/htc.h

+2 −9
Original line number Diff line number Diff line
@@ -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 {

drivers/net/wireless/ath/ath9k/htc_drv_main.c

+3 −1
Original line number Diff line number Diff line
@@ -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;

}