mirror of
git://projects.qi-hardware.com/openwrt-xburst.git
synced 2024-11-24 01:43:08 +02:00
mac80211: update to compat-wireless 2009-12-05 and fix a critical bug in ath9k tx status reporting
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@18666 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
nbd
parent
2ec93f271b
commit
7b359d21c6
@ -10,12 +10,12 @@ include $(INCLUDE_DIR)/kernel.mk
|
||||
|
||||
PKG_NAME:=mac80211
|
||||
|
||||
PKG_VERSION:=2009-11-21
|
||||
PKG_VERSION:=2009-12-05
|
||||
PKG_RELEASE:=7
|
||||
PKG_SOURCE_URL:= \
|
||||
http://www.orbit-lab.org/kernel/compat-wireless-2.6/2009/11 \
|
||||
http://www.orbit-lab.org/kernel/compat-wireless-2.6/2009/12 \
|
||||
http://wireless.kernel.org/download/compat-wireless-2.6
|
||||
PKG_MD5SUM:=00e80559cddaa160605098572f5c58b8
|
||||
PKG_MD5SUM:=5b432e35626af4036ed55da75fff3fca
|
||||
|
||||
PKG_SOURCE:=compat-wireless-$(PKG_VERSION).tar.bz2
|
||||
PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/compat-wireless-$(PKG_VERSION)
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
--- a/drivers/net/wireless/ath/ath9k/main.c
|
||||
+++ b/drivers/net/wireless/ath/ath9k/main.c
|
||||
@@ -1139,6 +1139,9 @@ static void ath_unregister_led(struct at
|
||||
@@ -1112,6 +1112,9 @@ static void ath_unregister_led(struct at
|
||||
|
||||
static void ath_deinit_leds(struct ath_softc *sc)
|
||||
{
|
||||
@ -10,7 +10,7 @@
|
||||
ath_unregister_led(&sc->assoc_led);
|
||||
sc->sc_flags &= ~SC_OP_LED_ASSOCIATED;
|
||||
ath_unregister_led(&sc->tx_led);
|
||||
@@ -1157,6 +1160,9 @@ static void ath_init_leds(struct ath_sof
|
||||
@@ -1130,6 +1133,9 @@ static void ath_init_leds(struct ath_sof
|
||||
else
|
||||
sc->sc_ah->led_pin = ATH_LED_PIN_DEF;
|
||||
|
||||
|
||||
@ -8,7 +8,7 @@
|
||||
#include <asm/unaligned.h>
|
||||
|
||||
#include "hw.h"
|
||||
@@ -489,8 +490,18 @@ static int ath9k_hw_init_macaddr(struct
|
||||
@@ -485,8 +486,18 @@ static int ath9k_hw_init_macaddr(struct
|
||||
common->macaddr[2 * i] = eeval >> 8;
|
||||
common->macaddr[2 * i + 1] = eeval & 0xff;
|
||||
}
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
--- a/drivers/net/wireless/ath/ath9k/hw.c
|
||||
+++ b/drivers/net/wireless/ath/ath9k/hw.c
|
||||
@@ -431,11 +431,8 @@ static void ath9k_hw_init_defaults(struc
|
||||
@@ -427,11 +427,8 @@ static void ath9k_hw_init_defaults(struc
|
||||
ah->hw_version.magic = AR5416_MAGIC;
|
||||
ah->hw_version.subvendorid = 0;
|
||||
|
||||
@ -22,7 +22,7 @@
|
||||
#include "ath9k.h"
|
||||
#include "btcoex.h"
|
||||
|
||||
@@ -1633,6 +1634,7 @@ static int ath_init_softc(u16 devid, str
|
||||
@@ -1606,6 +1607,7 @@ static int ath_init_softc(u16 devid, str
|
||||
{
|
||||
struct ath_hw *ah = NULL;
|
||||
struct ath_common *common;
|
||||
@ -30,7 +30,7 @@
|
||||
int r = 0, i;
|
||||
int csz = 0;
|
||||
int qnum;
|
||||
@@ -1656,6 +1658,10 @@ static int ath_init_softc(u16 devid, str
|
||||
@@ -1629,6 +1631,10 @@ static int ath_init_softc(u16 devid, str
|
||||
|
||||
ah->hw_version.devid = devid;
|
||||
ah->hw_version.subsysid = subsysid;
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@ -1,477 +0,0 @@
|
||||
--- a/drivers/net/wireless/ath/ath9k/rc.h
|
||||
+++ b/drivers/net/wireless/ath/ath9k/rc.h
|
||||
@@ -112,14 +112,12 @@ struct ath_rate_table {
|
||||
u32 ratekbps;
|
||||
u32 user_ratekbps;
|
||||
u8 ratecode;
|
||||
- u8 short_preamble;
|
||||
u8 dot11rate;
|
||||
u8 ctrl_rate;
|
||||
u8 base_index;
|
||||
u8 cw40index;
|
||||
u8 sgi_index;
|
||||
u8 ht_index;
|
||||
- u32 max_4ms_framelen;
|
||||
} info[RATE_TABLE_SIZE];
|
||||
u32 probe_interval;
|
||||
u8 initial_ratemax;
|
||||
--- a/drivers/net/wireless/ath/ath9k/rc.c
|
||||
+++ b/drivers/net/wireless/ath/ath9k/rc.c
|
||||
@@ -22,131 +22,89 @@ static const struct ath_rate_table ar541
|
||||
8, /* MCS start */
|
||||
{
|
||||
{ VALID, VALID, WLAN_RC_PHY_OFDM, 6000, /* 6 Mb */
|
||||
- 5400, 0, 0x00, 12,
|
||||
- 0, 0, 0, 0, 0, 0 },
|
||||
+ 5400, 0, 12, 0, 0, 0, 0, 0 },
|
||||
{ VALID, VALID, WLAN_RC_PHY_OFDM, 9000, /* 9 Mb */
|
||||
- 7800, 1, 0x00, 18,
|
||||
- 0, 1, 1, 1, 1, 0 },
|
||||
+ 7800, 1, 18, 0, 1, 1, 1, 1 },
|
||||
{ VALID, VALID, WLAN_RC_PHY_OFDM, 12000, /* 12 Mb */
|
||||
- 10000, 2, 0x00, 24,
|
||||
- 2, 2, 2, 2, 2, 0 },
|
||||
+ 10000, 2, 24, 2, 2, 2, 2, 2 },
|
||||
{ VALID, VALID, WLAN_RC_PHY_OFDM, 18000, /* 18 Mb */
|
||||
- 13900, 3, 0x00, 36,
|
||||
- 2, 3, 3, 3, 3, 0 },
|
||||
+ 13900, 3, 36, 2, 3, 3, 3, 3 },
|
||||
{ VALID, VALID, WLAN_RC_PHY_OFDM, 24000, /* 24 Mb */
|
||||
- 17300, 4, 0x00, 48,
|
||||
- 4, 4, 4, 4, 4, 0 },
|
||||
+ 17300, 4, 48, 4, 4, 4, 4, 4 },
|
||||
{ VALID, VALID, WLAN_RC_PHY_OFDM, 36000, /* 36 Mb */
|
||||
- 23000, 5, 0x00, 72,
|
||||
- 4, 5, 5, 5, 5, 0 },
|
||||
+ 23000, 5, 72, 4, 5, 5, 5, 5 },
|
||||
{ VALID, VALID, WLAN_RC_PHY_OFDM, 48000, /* 48 Mb */
|
||||
- 27400, 6, 0x00, 96,
|
||||
- 4, 6, 6, 6, 6, 0 },
|
||||
+ 27400, 6, 96, 4, 6, 6, 6, 6 },
|
||||
{ VALID, VALID, WLAN_RC_PHY_OFDM, 54000, /* 54 Mb */
|
||||
- 29300, 7, 0x00, 108,
|
||||
- 4, 7, 7, 7, 7, 0 },
|
||||
+ 29300, 7, 108, 4, 7, 7, 7, 7 },
|
||||
{ VALID_2040, VALID_2040, WLAN_RC_PHY_HT_20_SS, 6500, /* 6.5 Mb */
|
||||
- 6400, 0, 0x00, 0,
|
||||
- 0, 8, 24, 8, 24, 3216 },
|
||||
+ 6400, 0, 0, 0, 8, 24, 8, 24 },
|
||||
{ VALID_20, VALID_20, WLAN_RC_PHY_HT_20_SS, 13000, /* 13 Mb */
|
||||
- 12700, 1, 0x00, 1,
|
||||
- 2, 9, 25, 9, 25, 6434 },
|
||||
+ 12700, 1, 1, 2, 9, 25, 9, 25 },
|
||||
{ VALID_20, VALID_20, WLAN_RC_PHY_HT_20_SS, 19500, /* 19.5 Mb */
|
||||
- 18800, 2, 0x00, 2,
|
||||
- 2, 10, 26, 10, 26, 9650 },
|
||||
+ 18800, 2, 2, 2, 10, 26, 10, 26 },
|
||||
{ VALID_20, VALID_20, WLAN_RC_PHY_HT_20_SS, 26000, /* 26 Mb */
|
||||
- 25000, 3, 0x00, 3,
|
||||
- 4, 11, 27, 11, 27, 12868 },
|
||||
+ 25000, 3, 3, 4, 11, 27, 11, 27 },
|
||||
{ VALID_20, VALID_20, WLAN_RC_PHY_HT_20_SS, 39000, /* 39 Mb */
|
||||
- 36700, 4, 0x00, 4,
|
||||
- 4, 12, 28, 12, 28, 19304 },
|
||||
+ 36700, 4, 4, 4, 12, 28, 12, 28 },
|
||||
{ INVALID, VALID_20, WLAN_RC_PHY_HT_20_SS, 52000, /* 52 Mb */
|
||||
- 48100, 5, 0x00, 5,
|
||||
- 4, 13, 29, 13, 29, 25740 },
|
||||
+ 48100, 5, 5, 4, 13, 29, 13, 29 },
|
||||
{ INVALID, VALID_20, WLAN_RC_PHY_HT_20_SS, 58500, /* 58.5 Mb */
|
||||
- 53500, 6, 0x00, 6,
|
||||
- 4, 14, 30, 14, 30, 28956 },
|
||||
+ 53500, 6, 6, 4, 14, 30, 14, 30 },
|
||||
{ INVALID, VALID_20, WLAN_RC_PHY_HT_20_SS, 65000, /* 65 Mb */
|
||||
- 59000, 7, 0x00, 7,
|
||||
- 4, 15, 31, 15, 32, 32180 },
|
||||
+ 59000, 7, 7, 4, 15, 31, 15, 32 },
|
||||
{ INVALID, INVALID, WLAN_RC_PHY_HT_20_DS, 13000, /* 13 Mb */
|
||||
- 12700, 8, 0x00,
|
||||
- 8, 3, 16, 33, 16, 33, 6430 },
|
||||
+ 12700, 8, 8, 3, 16, 33, 16, 33 },
|
||||
{ INVALID, INVALID, WLAN_RC_PHY_HT_20_DS, 26000, /* 26 Mb */
|
||||
- 24800, 9, 0x00, 9,
|
||||
- 2, 17, 34, 17, 34, 12860 },
|
||||
+ 24800, 9, 9, 2, 17, 34, 17, 34 },
|
||||
{ INVALID, INVALID, WLAN_RC_PHY_HT_20_DS, 39000, /* 39 Mb */
|
||||
- 36600, 10, 0x00, 10,
|
||||
- 2, 18, 35, 18, 35, 19300 },
|
||||
+ 36600, 10, 10, 2, 18, 35, 18, 35 },
|
||||
{ VALID_20, INVALID, WLAN_RC_PHY_HT_20_DS, 52000, /* 52 Mb */
|
||||
- 48100, 11, 0x00, 11,
|
||||
- 4, 19, 36, 19, 36, 25736 },
|
||||
+ 48100, 11, 11, 4, 19, 36, 19, 36 },
|
||||
{ VALID_20, INVALID, WLAN_RC_PHY_HT_20_DS, 78000, /* 78 Mb */
|
||||
- 69500, 12, 0x00, 12,
|
||||
- 4, 20, 37, 20, 37, 38600 },
|
||||
+ 69500, 12, 12, 4, 20, 37, 20, 37 },
|
||||
{ VALID_20, INVALID, WLAN_RC_PHY_HT_20_DS, 104000, /* 104 Mb */
|
||||
- 89500, 13, 0x00, 13,
|
||||
- 4, 21, 38, 21, 38, 51472 },
|
||||
+ 89500, 13, 13, 4, 21, 38, 21, 38 },
|
||||
{ VALID_20, INVALID, WLAN_RC_PHY_HT_20_DS, 117000, /* 117 Mb */
|
||||
- 98900, 14, 0x00, 14,
|
||||
- 4, 22, 39, 22, 39, 57890 },
|
||||
+ 98900, 14, 14, 4, 22, 39, 22, 39 },
|
||||
{ VALID_20, INVALID, WLAN_RC_PHY_HT_20_DS, 130000, /* 130 Mb */
|
||||
- 108300, 15, 0x00, 15,
|
||||
- 4, 23, 40, 23, 41, 64320 },
|
||||
+ 108300, 15, 15, 4, 23, 40, 23, 41 },
|
||||
{ VALID_40, VALID_40, WLAN_RC_PHY_HT_40_SS, 13500, /* 13.5 Mb */
|
||||
- 13200, 0, 0x00, 0,
|
||||
- 0, 8, 24, 24, 24, 6684 },
|
||||
+ 13200, 0, 0, 0, 8, 24, 24, 24 },
|
||||
{ VALID_40, VALID_40, WLAN_RC_PHY_HT_40_SS, 27500, /* 27.0 Mb */
|
||||
- 25900, 1, 0x00, 1,
|
||||
- 2, 9, 25, 25, 25, 13368 },
|
||||
+ 25900, 1, 1, 2, 9, 25, 25, 25 },
|
||||
{ VALID_40, VALID_40, WLAN_RC_PHY_HT_40_SS, 40500, /* 40.5 Mb */
|
||||
- 38600, 2, 0x00, 2,
|
||||
- 2, 10, 26, 26, 26, 20052 },
|
||||
+ 38600, 2, 2, 2, 10, 26, 26, 26 },
|
||||
{ VALID_40, VALID_40, WLAN_RC_PHY_HT_40_SS, 54000, /* 54 Mb */
|
||||
- 49800, 3, 0x00, 3,
|
||||
- 4, 11, 27, 27, 27, 26738 },
|
||||
+ 49800, 3, 3, 4, 11, 27, 27, 27 },
|
||||
{ VALID_40, VALID_40, WLAN_RC_PHY_HT_40_SS, 81500, /* 81 Mb */
|
||||
- 72200, 4, 0x00, 4,
|
||||
- 4, 12, 28, 28, 28, 40104 },
|
||||
+ 72200, 4, 4, 4, 12, 28, 28, 28 },
|
||||
{ INVALID, VALID_40, WLAN_RC_PHY_HT_40_SS, 108000, /* 108 Mb */
|
||||
- 92900, 5, 0x00, 5,
|
||||
- 4, 13, 29, 29, 29, 53476 },
|
||||
+ 92900, 5, 5, 4, 13, 29, 29, 29 },
|
||||
{ INVALID, VALID_40, WLAN_RC_PHY_HT_40_SS, 121500, /* 121.5 Mb */
|
||||
- 102700, 6, 0x00, 6,
|
||||
- 4, 14, 30, 30, 30, 60156 },
|
||||
+ 102700, 6, 6, 4, 14, 30, 30, 30 },
|
||||
{ INVALID, VALID_40, WLAN_RC_PHY_HT_40_SS, 135000, /* 135 Mb */
|
||||
- 112000, 7, 0x00, 7,
|
||||
- 4, 15, 31, 32, 32, 66840 },
|
||||
+ 112000, 7, 7, 4, 15, 31, 32, 32 },
|
||||
{ INVALID, VALID_40, WLAN_RC_PHY_HT_40_SS_HGI, 150000, /* 150 Mb */
|
||||
- 122000, 7, 0x00, 7,
|
||||
- 4, 15, 31, 32, 32, 74200 },
|
||||
+ 122000, 7, 7, 4, 15, 31, 32, 32 },
|
||||
{ INVALID, INVALID, WLAN_RC_PHY_HT_40_DS, 27000, /* 27 Mb */
|
||||
- 25800, 8, 0x00, 8,
|
||||
- 0, 16, 33, 33, 33, 13360 },
|
||||
+ 25800, 8, 8, 0, 16, 33, 33, 33 },
|
||||
{ INVALID, INVALID, WLAN_RC_PHY_HT_40_DS, 54000, /* 54 Mb */
|
||||
- 49800, 9, 0x00, 9,
|
||||
- 2, 17, 34, 34, 34, 26720 },
|
||||
+ 49800, 9, 9, 2, 17, 34, 34, 34 },
|
||||
{ INVALID, INVALID, WLAN_RC_PHY_HT_40_DS, 81000, /* 81 Mb */
|
||||
- 71900, 10, 0x00, 10,
|
||||
- 2, 18, 35, 35, 35, 40080 },
|
||||
+ 71900, 10, 10, 2, 18, 35, 35, 35 },
|
||||
{ VALID_40, INVALID, WLAN_RC_PHY_HT_40_DS, 108000, /* 108 Mb */
|
||||
- 92500, 11, 0x00, 11,
|
||||
- 4, 19, 36, 36, 36, 53440 },
|
||||
+ 92500, 11, 11, 4, 19, 36, 36, 36 },
|
||||
{ VALID_40, INVALID, WLAN_RC_PHY_HT_40_DS, 162000, /* 162 Mb */
|
||||
- 130300, 12, 0x00, 12,
|
||||
- 4, 20, 37, 37, 37, 80160 },
|
||||
+ 130300, 12, 12, 4, 20, 37, 37, 37 },
|
||||
{ VALID_40, INVALID, WLAN_RC_PHY_HT_40_DS, 216000, /* 216 Mb */
|
||||
- 162800, 13, 0x00, 13,
|
||||
- 4, 21, 38, 38, 38, 106880 },
|
||||
+ 162800, 13, 13, 4, 21, 38, 38, 38 },
|
||||
{ VALID_40, INVALID, WLAN_RC_PHY_HT_40_DS, 243000, /* 243 Mb */
|
||||
- 178200, 14, 0x00, 14,
|
||||
- 4, 22, 39, 39, 39, 120240 },
|
||||
+ 178200, 14, 14, 4, 22, 39, 39, 39 },
|
||||
{ VALID_40, INVALID, WLAN_RC_PHY_HT_40_DS, 270000, /* 270 Mb */
|
||||
- 192100, 15, 0x00, 15,
|
||||
- 4, 23, 40, 41, 41, 133600 },
|
||||
+ 192100, 15, 15, 4, 23, 40, 41, 41 },
|
||||
{ VALID_40, INVALID, WLAN_RC_PHY_HT_40_DS_HGI, 300000, /* 300 Mb */
|
||||
- 207000, 15, 0x00, 15,
|
||||
- 4, 23, 40, 41, 41, 148400 },
|
||||
+ 207000, 15, 15, 4, 23, 40, 41, 41 },
|
||||
},
|
||||
50, /* probe interval */
|
||||
WLAN_RC_HT_FLAG, /* Phy rates allowed initially */
|
||||
@@ -160,144 +118,98 @@ static const struct ath_rate_table ar541
|
||||
12, /* MCS start */
|
||||
{
|
||||
{ VALID_ALL, VALID_ALL, WLAN_RC_PHY_CCK, 1000, /* 1 Mb */
|
||||
- 900, 0, 0x00, 2,
|
||||
- 0, 0, 0, 0, 0, 0 },
|
||||
+ 900, 0, 2, 0, 0, 0, 0, 0 },
|
||||
{ VALID_ALL, VALID_ALL, WLAN_RC_PHY_CCK, 2000, /* 2 Mb */
|
||||
- 1900, 1, 0x04, 4,
|
||||
- 1, 1, 1, 1, 1, 0 },
|
||||
+ 1900, 1, 4, 1, 1, 1, 1, 1 },
|
||||
{ VALID_ALL, VALID_ALL, WLAN_RC_PHY_CCK, 5500, /* 5.5 Mb */
|
||||
- 4900, 2, 0x04, 11,
|
||||
- 2, 2, 2, 2, 2, 0 },
|
||||
+ 4900, 2, 11, 2, 2, 2, 2, 2 },
|
||||
{ VALID_ALL, VALID_ALL, WLAN_RC_PHY_CCK, 11000, /* 11 Mb */
|
||||
- 8100, 3, 0x04, 22,
|
||||
- 3, 3, 3, 3, 3, 0 },
|
||||
+ 8100, 3, 22, 3, 3, 3, 3, 3 },
|
||||
{ INVALID, INVALID, WLAN_RC_PHY_OFDM, 6000, /* 6 Mb */
|
||||
- 5400, 4, 0x00, 12,
|
||||
- 4, 4, 4, 4, 4, 0 },
|
||||
+ 5400, 4, 12, 4, 4, 4, 4, 4 },
|
||||
{ INVALID, INVALID, WLAN_RC_PHY_OFDM, 9000, /* 9 Mb */
|
||||
- 7800, 5, 0x00, 18,
|
||||
- 4, 5, 5, 5, 5, 0 },
|
||||
+ 7800, 5, 18, 4, 5, 5, 5, 5 },
|
||||
{ VALID, VALID, WLAN_RC_PHY_OFDM, 12000, /* 12 Mb */
|
||||
- 10100, 6, 0x00, 24,
|
||||
- 6, 6, 6, 6, 6, 0 },
|
||||
+ 10100, 6, 24, 6, 6, 6, 6, 6 },
|
||||
{ VALID, VALID, WLAN_RC_PHY_OFDM, 18000, /* 18 Mb */
|
||||
- 14100, 7, 0x00, 36,
|
||||
- 6, 7, 7, 7, 7, 0 },
|
||||
+ 14100, 7, 36, 6, 7, 7, 7, 7 },
|
||||
{ VALID, VALID, WLAN_RC_PHY_OFDM, 24000, /* 24 Mb */
|
||||
- 17700, 8, 0x00, 48,
|
||||
- 8, 8, 8, 8, 8, 0 },
|
||||
+ 17700, 8, 48, 8, 8, 8, 8, 8 },
|
||||
{ VALID, VALID, WLAN_RC_PHY_OFDM, 36000, /* 36 Mb */
|
||||
- 23700, 9, 0x00, 72,
|
||||
- 8, 9, 9, 9, 9, 0 },
|
||||
+ 23700, 9, 72, 8, 9, 9, 9, 9 },
|
||||
{ VALID, VALID, WLAN_RC_PHY_OFDM, 48000, /* 48 Mb */
|
||||
- 27400, 10, 0x00, 96,
|
||||
- 8, 10, 10, 10, 10, 0 },
|
||||
+ 27400, 10, 96, 8, 10, 10, 10, 10 },
|
||||
{ VALID, VALID, WLAN_RC_PHY_OFDM, 54000, /* 54 Mb */
|
||||
- 30900, 11, 0x00, 108,
|
||||
- 8, 11, 11, 11, 11, 0 },
|
||||
+ 30900, 11, 108, 8, 11, 11, 11, 11 },
|
||||
{ INVALID, INVALID, WLAN_RC_PHY_HT_20_SS, 6500, /* 6.5 Mb */
|
||||
- 6400, 0, 0x00, 0,
|
||||
- 4, 12, 28, 12, 28, 3216 },
|
||||
+ 6400, 0, 0, 4, 12, 28, 12, 28 },
|
||||
{ VALID_20, VALID_20, WLAN_RC_PHY_HT_20_SS, 13000, /* 13 Mb */
|
||||
- 12700, 1, 0x00, 1,
|
||||
- 6, 13, 29, 13, 29, 6434 },
|
||||
+ 12700, 1, 1, 6, 13, 29, 13, 29 },
|
||||
{ VALID_20, VALID_20, WLAN_RC_PHY_HT_20_SS, 19500, /* 19.5 Mb */
|
||||
- 18800, 2, 0x00, 2,
|
||||
- 6, 14, 30, 14, 30, 9650 },
|
||||
+ 18800, 2, 2, 6, 14, 30, 14, 30 },
|
||||
{ VALID_20, VALID_20, WLAN_RC_PHY_HT_20_SS, 26000, /* 26 Mb */
|
||||
- 25000, 3, 0x00, 3,
|
||||
- 8, 15, 31, 15, 31, 12868 },
|
||||
+ 25000, 3, 3, 8, 15, 31, 15, 31 },
|
||||
{ VALID_20, VALID_20, WLAN_RC_PHY_HT_20_SS, 39000, /* 39 Mb */
|
||||
- 36700, 4, 0x00, 4,
|
||||
- 8, 16, 32, 16, 32, 19304 },
|
||||
+ 36700, 4, 4, 8, 16, 32, 16, 32 },
|
||||
{ INVALID, VALID_20, WLAN_RC_PHY_HT_20_SS, 52000, /* 52 Mb */
|
||||
- 48100, 5, 0x00, 5,
|
||||
- 8, 17, 33, 17, 33, 25740 },
|
||||
+ 48100, 5, 5, 8, 17, 33, 17, 33 },
|
||||
{ INVALID, VALID_20, WLAN_RC_PHY_HT_20_SS, 58500, /* 58.5 Mb */
|
||||
- 53500, 6, 0x00, 6,
|
||||
- 8, 18, 34, 18, 34, 28956 },
|
||||
+ 53500, 6, 6, 8, 18, 34, 18, 34 },
|
||||
{ INVALID, VALID_20, WLAN_RC_PHY_HT_20_SS, 65000, /* 65 Mb */
|
||||
- 59000, 7, 0x00, 7,
|
||||
- 8, 19, 35, 19, 36, 32180 },
|
||||
+ 59000, 7, 7, 8, 19, 35, 19, 36 },
|
||||
{ INVALID, INVALID, WLAN_RC_PHY_HT_20_DS, 13000, /* 13 Mb */
|
||||
- 12700, 8, 0x00, 8,
|
||||
- 4, 20, 37, 20, 37, 6430 },
|
||||
+ 12700, 8, 8, 4, 20, 37, 20, 37 },
|
||||
{ INVALID, INVALID, WLAN_RC_PHY_HT_20_DS, 26000, /* 26 Mb */
|
||||
- 24800, 9, 0x00, 9,
|
||||
- 6, 21, 38, 21, 38, 12860 },
|
||||
+ 24800, 9, 9, 6, 21, 38, 21, 38 },
|
||||
{ INVALID, INVALID, WLAN_RC_PHY_HT_20_DS, 39000, /* 39 Mb */
|
||||
- 36600, 10, 0x00, 10,
|
||||
- 6, 22, 39, 22, 39, 19300 },
|
||||
+ 36600, 10, 10, 6, 22, 39, 22, 39 },
|
||||
{ VALID_20, INVALID, WLAN_RC_PHY_HT_20_DS, 52000, /* 52 Mb */
|
||||
- 48100, 11, 0x00, 11,
|
||||
- 8, 23, 40, 23, 40, 25736 },
|
||||
+ 48100, 11, 11, 8, 23, 40, 23, 40 },
|
||||
{ VALID_20, INVALID, WLAN_RC_PHY_HT_20_DS, 78000, /* 78 Mb */
|
||||
- 69500, 12, 0x00, 12,
|
||||
- 8, 24, 41, 24, 41, 38600 },
|
||||
+ 69500, 12, 12, 8, 24, 41, 24, 41 },
|
||||
{ VALID_20, INVALID, WLAN_RC_PHY_HT_20_DS, 104000, /* 104 Mb */
|
||||
- 89500, 13, 0x00, 13,
|
||||
- 8, 25, 42, 25, 42, 51472 },
|
||||
+ 89500, 13, 13, 8, 25, 42, 25, 42 },
|
||||
{ VALID_20, INVALID, WLAN_RC_PHY_HT_20_DS, 117000, /* 117 Mb */
|
||||
- 98900, 14, 0x00, 14,
|
||||
- 8, 26, 43, 26, 44, 57890 },
|
||||
+ 98900, 14, 14, 8, 26, 43, 26, 44 },
|
||||
{ VALID_20, INVALID, WLAN_RC_PHY_HT_20_DS, 130000, /* 130 Mb */
|
||||
- 108300, 15, 0x00, 15,
|
||||
- 8, 27, 44, 27, 45, 64320 },
|
||||
+ 108300, 15, 15, 8, 27, 44, 27, 45 },
|
||||
{ VALID_40, VALID_40, WLAN_RC_PHY_HT_40_SS, 13500, /* 13.5 Mb */
|
||||
- 13200, 0, 0x00, 0,
|
||||
- 8, 12, 28, 28, 28, 6684 },
|
||||
+ 13200, 0, 0, 8, 12, 28, 28, 28 },
|
||||
{ VALID_40, VALID_40, WLAN_RC_PHY_HT_40_SS, 27500, /* 27.0 Mb */
|
||||
- 25900, 1, 0x00, 1,
|
||||
- 8, 13, 29, 29, 29, 13368 },
|
||||
+ 25900, 1, 1, 8, 13, 29, 29, 29 },
|
||||
{ VALID_40, VALID_40, WLAN_RC_PHY_HT_40_SS, 40500, /* 40.5 Mb */
|
||||
- 38600, 2, 0x00, 2,
|
||||
- 8, 14, 30, 30, 30, 20052 },
|
||||
+ 38600, 2, 2, 8, 14, 30, 30, 30 },
|
||||
{ VALID_40, VALID_40, WLAN_RC_PHY_HT_40_SS, 54000, /* 54 Mb */
|
||||
- 49800, 3, 0x00, 3,
|
||||
- 8, 15, 31, 31, 31, 26738 },
|
||||
+ 49800, 3, 3, 8, 15, 31, 31, 31 },
|
||||
{ VALID_40, VALID_40, WLAN_RC_PHY_HT_40_SS, 81500, /* 81 Mb */
|
||||
- 72200, 4, 0x00, 4,
|
||||
- 8, 16, 32, 32, 32, 40104 },
|
||||
+ 72200, 4, 4, 8, 16, 32, 32, 32 },
|
||||
{ INVALID, VALID_40, WLAN_RC_PHY_HT_40_SS, 108000, /* 108 Mb */
|
||||
- 92900, 5, 0x00, 5,
|
||||
- 8, 17, 33, 33, 33, 53476 },
|
||||
+ 92900, 5, 5, 8, 17, 33, 33, 33 },
|
||||
{ INVALID, VALID_40, WLAN_RC_PHY_HT_40_SS, 121500, /* 121.5 Mb */
|
||||
- 102700, 6, 0x00, 6,
|
||||
- 8, 18, 34, 34, 34, 60156 },
|
||||
+ 102700, 6, 6, 8, 18, 34, 34, 34 },
|
||||
{ INVALID, VALID_40, WLAN_RC_PHY_HT_40_SS, 135000, /* 135 Mb */
|
||||
- 112000, 7, 0x00, 7,
|
||||
- 8, 19, 35, 36, 36, 66840 },
|
||||
+ 112000, 7, 7, 8, 19, 35, 36, 36 },
|
||||
{ INVALID, VALID_40, WLAN_RC_PHY_HT_40_SS_HGI, 150000, /* 150 Mb */
|
||||
- 122000, 7, 0x00, 7,
|
||||
- 8, 19, 35, 36, 36, 74200 },
|
||||
+ 122000, 7, 7, 8, 19, 35, 36, 36 },
|
||||
{ INVALID, INVALID, WLAN_RC_PHY_HT_40_DS, 27000, /* 27 Mb */
|
||||
- 25800, 8, 0x00, 8,
|
||||
- 8, 20, 37, 37, 37, 13360 },
|
||||
+ 25800, 8, 8, 8, 20, 37, 37, 37 },
|
||||
{ INVALID, INVALID, WLAN_RC_PHY_HT_40_DS, 54000, /* 54 Mb */
|
||||
- 49800, 9, 0x00, 9,
|
||||
- 8, 21, 38, 38, 38, 26720 },
|
||||
+ 49800, 9, 9, 8, 21, 38, 38, 38 },
|
||||
{ INVALID, INVALID, WLAN_RC_PHY_HT_40_DS, 81000, /* 81 Mb */
|
||||
- 71900, 10, 0x00, 10,
|
||||
- 8, 22, 39, 39, 39, 40080 },
|
||||
+ 71900, 10, 10, 8, 22, 39, 39, 39 },
|
||||
{ VALID_40, INVALID, WLAN_RC_PHY_HT_40_DS, 108000, /* 108 Mb */
|
||||
- 92500, 11, 0x00, 11,
|
||||
- 8, 23, 40, 40, 40, 53440 },
|
||||
+ 92500, 11, 11, 8, 23, 40, 40, 40 },
|
||||
{ VALID_40, INVALID, WLAN_RC_PHY_HT_40_DS, 162000, /* 162 Mb */
|
||||
- 130300, 12, 0x00, 12,
|
||||
- 8, 24, 41, 41, 41, 80160 },
|
||||
+ 130300, 12, 12, 8, 24, 41, 41, 41 },
|
||||
{ VALID_40, INVALID, WLAN_RC_PHY_HT_40_DS, 216000, /* 216 Mb */
|
||||
- 162800, 13, 0x00, 13,
|
||||
- 8, 25, 42, 42, 42, 106880 },
|
||||
+ 162800, 13, 13, 8, 25, 42, 42, 42 },
|
||||
{ VALID_40, INVALID, WLAN_RC_PHY_HT_40_DS, 243000, /* 243 Mb */
|
||||
- 178200, 14, 0x00, 14,
|
||||
- 8, 26, 43, 43, 43, 120240 },
|
||||
+ 178200, 14, 14, 8, 26, 43, 43, 43 },
|
||||
{ VALID_40, INVALID, WLAN_RC_PHY_HT_40_DS, 270000, /* 270 Mb */
|
||||
- 192100, 15, 0x00, 15,
|
||||
- 8, 27, 44, 45, 45, 133600 },
|
||||
+ 192100, 15, 15, 8, 27, 44, 45, 45 },
|
||||
{ VALID_40, INVALID, WLAN_RC_PHY_HT_40_DS_HGI, 300000, /* 300 Mb */
|
||||
- 207000, 15, 0x00, 15,
|
||||
- 8, 27, 44, 45, 45, 148400 },
|
||||
- },
|
||||
+ 207000, 15, 15, 8, 27, 44, 45, 45 },
|
||||
+ },
|
||||
50, /* probe interval */
|
||||
WLAN_RC_HT_FLAG, /* Phy rates allowed initially */
|
||||
};
|
||||
@@ -307,29 +219,21 @@ static const struct ath_rate_table ar541
|
||||
0,
|
||||
{
|
||||
{ VALID, VALID, WLAN_RC_PHY_OFDM, 6000, /* 6 Mb */
|
||||
- 5400, 0, 0x00, 12,
|
||||
- 0, 0, 0 },
|
||||
+ 5400, 0, 12, 0, 0, 0 },
|
||||
{ VALID, VALID, WLAN_RC_PHY_OFDM, 9000, /* 9 Mb */
|
||||
- 7800, 1, 0x00, 18,
|
||||
- 0, 1, 0 },
|
||||
+ 7800, 1, 18, 0, 1, 0 },
|
||||
{ VALID, VALID, WLAN_RC_PHY_OFDM, 12000, /* 12 Mb */
|
||||
- 10000, 2, 0x00, 24,
|
||||
- 2, 2, 0 },
|
||||
+ 10000, 2, 24, 2, 2, 0 },
|
||||
{ VALID, VALID, WLAN_RC_PHY_OFDM, 18000, /* 18 Mb */
|
||||
- 13900, 3, 0x00, 36,
|
||||
- 2, 3, 0 },
|
||||
+ 13900, 3, 36, 2, 3, 0 },
|
||||
{ VALID, VALID, WLAN_RC_PHY_OFDM, 24000, /* 24 Mb */
|
||||
- 17300, 4, 0x00, 48,
|
||||
- 4, 4, 0 },
|
||||
+ 17300, 4, 48, 4, 4, 0 },
|
||||
{ VALID, VALID, WLAN_RC_PHY_OFDM, 36000, /* 36 Mb */
|
||||
- 23000, 5, 0x00, 72,
|
||||
- 4, 5, 0 },
|
||||
+ 23000, 5, 72, 4, 5, 0 },
|
||||
{ VALID, VALID, WLAN_RC_PHY_OFDM, 48000, /* 48 Mb */
|
||||
- 27400, 6, 0x00, 96,
|
||||
- 4, 6, 0 },
|
||||
+ 27400, 6, 96, 4, 6, 0 },
|
||||
{ VALID, VALID, WLAN_RC_PHY_OFDM, 54000, /* 54 Mb */
|
||||
- 29300, 7, 0x00, 108,
|
||||
- 4, 7, 0 },
|
||||
+ 29300, 7, 108, 4, 7, 0 },
|
||||
},
|
||||
50, /* probe interval */
|
||||
0, /* Phy rates allowed initially */
|
||||
@@ -340,41 +244,29 @@ static const struct ath_rate_table ar541
|
||||
0,
|
||||
{
|
||||
{ VALID, VALID, WLAN_RC_PHY_CCK, 1000, /* 1 Mb */
|
||||
- 900, 0, 0x00, 2,
|
||||
- 0, 0, 0 },
|
||||
+ 900, 0, 2, 0, 0, 0 },
|
||||
{ VALID, VALID, WLAN_RC_PHY_CCK, 2000, /* 2 Mb */
|
||||
- 1900, 1, 0x04, 4,
|
||||
- 1, 1, 0 },
|
||||
+ 1900, 1, 4, 1, 1, 0 },
|
||||
{ VALID, VALID, WLAN_RC_PHY_CCK, 5500, /* 5.5 Mb */
|
||||
- 4900, 2, 0x04, 11,
|
||||
- 2, 2, 0 },
|
||||
+ 4900, 2, 11, 2, 2, 0 },
|
||||
{ VALID, VALID, WLAN_RC_PHY_CCK, 11000, /* 11 Mb */
|
||||
- 8100, 3, 0x04, 22,
|
||||
- 3, 3, 0 },
|
||||
+ 8100, 3, 22, 3, 3, 0 },
|
||||
{ INVALID, INVALID, WLAN_RC_PHY_OFDM, 6000, /* 6 Mb */
|
||||
- 5400, 4, 0x00, 12,
|
||||
- 4, 4, 0 },
|
||||
+ 5400, 4, 12, 4, 4, 0 },
|
||||
{ INVALID, INVALID, WLAN_RC_PHY_OFDM, 9000, /* 9 Mb */
|
||||
- 7800, 5, 0x00, 18,
|
||||
- 4, 5, 0 },
|
||||
+ 7800, 5, 18, 4, 5, 0 },
|
||||
{ VALID, VALID, WLAN_RC_PHY_OFDM, 12000, /* 12 Mb */
|
||||
- 10000, 6, 0x00, 24,
|
||||
- 6, 6, 0 },
|
||||
+ 10000, 6, 24, 6, 6, 0 },
|
||||
{ VALID, VALID, WLAN_RC_PHY_OFDM, 18000, /* 18 Mb */
|
||||
- 13900, 7, 0x00, 36,
|
||||
- 6, 7, 0 },
|
||||
+ 13900, 7, 36, 6, 7, 0 },
|
||||
{ VALID, VALID, WLAN_RC_PHY_OFDM, 24000, /* 24 Mb */
|
||||
- 17300, 8, 0x00, 48,
|
||||
- 8, 8, 0 },
|
||||
+ 17300, 8, 48, 8, 8, 0 },
|
||||
{ VALID, VALID, WLAN_RC_PHY_OFDM, 36000, /* 36 Mb */
|
||||
- 23000, 9, 0x00, 72,
|
||||
- 8, 9, 0 },
|
||||
+ 23000, 9, 72, 8, 9, 0 },
|
||||
{ VALID, VALID, WLAN_RC_PHY_OFDM, 48000, /* 48 Mb */
|
||||
- 27400, 10, 0x00, 96,
|
||||
- 8, 10, 0 },
|
||||
+ 27400, 10, 96, 8, 10, 0 },
|
||||
{ VALID, VALID, WLAN_RC_PHY_OFDM, 54000, /* 54 Mb */
|
||||
- 29300, 11, 0x00, 108,
|
||||
- 8, 11, 0 },
|
||||
+ 29300, 11, 108, 8, 11, 0 },
|
||||
},
|
||||
50, /* probe interval */
|
||||
0, /* Phy rates allowed initially */
|
||||
@ -1,81 +0,0 @@
|
||||
--- a/drivers/net/wireless/ath/ath9k/Makefile
|
||||
+++ b/drivers/net/wireless/ath/ath9k/Makefile
|
||||
@@ -7,7 +7,7 @@ ath9k-y += beacon.o \
|
||||
|
||||
ath9k-$(CONFIG_PCI) += pci.o
|
||||
ath9k-$(CONFIG_ATHEROS_AR71XX) += ahb.o
|
||||
-ath9k-$(CONFIG_ATH9K_DEBUG) += debug.o
|
||||
+ath9k-$(CONFIG_ATH9K_DEBUGFS) += debug.o
|
||||
|
||||
obj-$(CONFIG_ATH9K) += ath9k.o
|
||||
|
||||
--- a/drivers/net/wireless/ath/ath9k/ath9k.h
|
||||
+++ b/drivers/net/wireless/ath/ath9k/ath9k.h
|
||||
@@ -483,7 +483,7 @@ struct ath_softc {
|
||||
|
||||
int beacon_interval;
|
||||
|
||||
-#ifdef CONFIG_ATH9K_DEBUG
|
||||
+#ifdef CONFIG_ATH9K_DEBUGFS
|
||||
struct ath9k_debug debug;
|
||||
#endif
|
||||
struct ath_beacon_config cur_beacon_conf;
|
||||
--- a/drivers/net/wireless/ath/ath9k/debug.c
|
||||
+++ b/drivers/net/wireless/ath/ath9k/debug.c
|
||||
@@ -31,6 +31,8 @@ static int ath9k_debugfs_open(struct ino
|
||||
return 0;
|
||||
}
|
||||
|
||||
+#ifdef CONFIG_ATH_DEBUG
|
||||
+
|
||||
static ssize_t read_file_debug(struct file *file, char __user *user_buf,
|
||||
size_t count, loff_t *ppos)
|
||||
{
|
||||
@@ -71,6 +73,8 @@ static const struct file_operations fops
|
||||
.owner = THIS_MODULE
|
||||
};
|
||||
|
||||
+#endif
|
||||
+
|
||||
static ssize_t read_file_dma(struct file *file, char __user *user_buf,
|
||||
size_t count, loff_t *ppos)
|
||||
{
|
||||
@@ -563,10 +567,12 @@ int ath9k_init_debug(struct ath_hw *ah)
|
||||
if (!sc->debug.debugfs_phy)
|
||||
goto err;
|
||||
|
||||
+#ifdef CONFIG_ATH_DEBUG
|
||||
sc->debug.debugfs_debug = debugfs_create_file("debug",
|
||||
S_IRUSR | S_IWUSR, sc->debug.debugfs_phy, sc, &fops_debug);
|
||||
if (!sc->debug.debugfs_debug)
|
||||
goto err;
|
||||
+#endif
|
||||
|
||||
sc->debug.debugfs_dma = debugfs_create_file("dma", S_IRUSR,
|
||||
sc->debug.debugfs_phy, sc, &fops_dma);
|
||||
--- a/drivers/net/wireless/ath/ath9k/debug.h
|
||||
+++ b/drivers/net/wireless/ath/ath9k/debug.h
|
||||
@@ -23,13 +23,13 @@
|
||||
struct ath_txq;
|
||||
struct ath_buf;
|
||||
|
||||
-#ifdef CONFIG_ATH9K_DEBUG
|
||||
+#ifdef CONFIG_ATH9K_DEBUGFS
|
||||
#define TX_STAT_INC(q, c) sc->debug.stats.txstats[q].c++
|
||||
#else
|
||||
#define TX_STAT_INC(q, c) do { } while (0)
|
||||
#endif
|
||||
|
||||
-#ifdef CONFIG_ATH9K_DEBUG
|
||||
+#ifdef CONFIG_ATH9K_DEBUGFS
|
||||
|
||||
/**
|
||||
* struct ath_interrupt_stats - Contains statistics about interrupts
|
||||
@@ -186,6 +186,6 @@ static inline void ath_debug_stat_retrie
|
||||
{
|
||||
}
|
||||
|
||||
-#endif /* CONFIG_ATH9K_DEBUG */
|
||||
+#endif /* CONFIG_ATH9K_DEBUGFS */
|
||||
|
||||
#endif /* DEBUG_H */
|
||||
11
package/mac80211/patches/540-ath9k_tx_fix.patch
Normal file
11
package/mac80211/patches/540-ath9k_tx_fix.patch
Normal file
@ -0,0 +1,11 @@
|
||||
--- a/drivers/net/wireless/ath/ath9k/xmit.c
|
||||
+++ b/drivers/net/wireless/ath/ath9k/xmit.c
|
||||
@@ -2078,7 +2078,7 @@ static void ath_tx_processq(struct ath_s
|
||||
&txq->axq_q, lastbf->list.prev);
|
||||
|
||||
txq->axq_depth--;
|
||||
- txok = (ds->ds_txstat.ts_status == 0);
|
||||
+ txok = !(ds->ds_txstat.ts_status & ATH9K_TXERR_FILT);
|
||||
txq->axq_tx_inprogress = false;
|
||||
spin_unlock_bh(&txq->axq_lock);
|
||||
|
||||
@ -1,108 +0,0 @@
|
||||
--- a/drivers/net/wireless/ath/ath9k/hw.c
|
||||
+++ b/drivers/net/wireless/ath/ath9k/hw.c
|
||||
@@ -979,7 +979,10 @@ int ath9k_hw_init(struct ath_hw *ah)
|
||||
return r;
|
||||
|
||||
ath9k_hw_init_mode_gain_regs(ah);
|
||||
- ath9k_hw_fill_cap_info(ah);
|
||||
+ r = ath9k_hw_fill_cap_info(ah);
|
||||
+ if (r)
|
||||
+ return r;
|
||||
+
|
||||
ath9k_hw_init_11a_eeprom_fix(ah);
|
||||
|
||||
r = ath9k_hw_init_macaddr(ah);
|
||||
@@ -3115,7 +3118,7 @@ EXPORT_SYMBOL(ath9k_hw_set_sta_beacon_ti
|
||||
/* HW Capabilities */
|
||||
/*******************/
|
||||
|
||||
-void ath9k_hw_fill_cap_info(struct ath_hw *ah)
|
||||
+int ath9k_hw_fill_cap_info(struct ath_hw *ah)
|
||||
{
|
||||
struct ath9k_hw_capabilities *pCap = &ah->caps;
|
||||
struct ath_regulatory *regulatory = ath9k_hw_regulatory(ah);
|
||||
@@ -3146,6 +3149,12 @@ void ath9k_hw_fill_cap_info(struct ath_h
|
||||
}
|
||||
|
||||
eeval = ah->eep_ops->get_eeprom(ah, EEP_OP_MODE);
|
||||
+ if ((eeval & (AR5416_OPFLAGS_11G | AR5416_OPFLAGS_11A)) == 0) {
|
||||
+ ath_print(common, ATH_DBG_FATAL,
|
||||
+ "no band has been marked as supported in EEPROM.\n");
|
||||
+ return -EINVAL;
|
||||
+ }
|
||||
+
|
||||
bitmap_zero(pCap->wireless_modes, ATH9K_MODE_MAX);
|
||||
|
||||
if (eeval & AR5416_OPFLAGS_11A) {
|
||||
@@ -3305,6 +3314,8 @@ void ath9k_hw_fill_cap_info(struct ath_h
|
||||
} else {
|
||||
btcoex_hw->scheme = ATH_BTCOEX_CFG_NONE;
|
||||
}
|
||||
+
|
||||
+ return 0;
|
||||
}
|
||||
|
||||
bool ath9k_hw_getcapability(struct ath_hw *ah, enum ath9k_capability_type type,
|
||||
--- a/drivers/net/wireless/ath/ath9k/hw.h
|
||||
+++ b/drivers/net/wireless/ath/ath9k/hw.h
|
||||
@@ -619,7 +619,7 @@ void ath9k_hw_detach(struct ath_hw *ah);
|
||||
int ath9k_hw_init(struct ath_hw *ah);
|
||||
int ath9k_hw_reset(struct ath_hw *ah, struct ath9k_channel *chan,
|
||||
bool bChannelChange);
|
||||
-void ath9k_hw_fill_cap_info(struct ath_hw *ah);
|
||||
+int ath9k_hw_fill_cap_info(struct ath_hw *ah);
|
||||
bool ath9k_hw_getcapability(struct ath_hw *ah, enum ath9k_capability_type type,
|
||||
u32 capability, u32 *result);
|
||||
bool ath9k_hw_setcapability(struct ath_hw *ah, enum ath9k_capability_type type,
|
||||
--- a/drivers/net/wireless/ath/ath9k/main.c
|
||||
+++ b/drivers/net/wireless/ath/ath9k/main.c
|
||||
@@ -1805,13 +1805,15 @@ static int ath_init_softc(u16 devid, str
|
||||
|
||||
/* setup channels and rates */
|
||||
|
||||
- sc->sbands[IEEE80211_BAND_2GHZ].channels = ath9k_2ghz_chantable;
|
||||
- sc->sbands[IEEE80211_BAND_2GHZ].band = IEEE80211_BAND_2GHZ;
|
||||
- sc->sbands[IEEE80211_BAND_2GHZ].n_channels =
|
||||
- ARRAY_SIZE(ath9k_2ghz_chantable);
|
||||
- sc->sbands[IEEE80211_BAND_2GHZ].bitrates = ath9k_legacy_rates;
|
||||
- sc->sbands[IEEE80211_BAND_2GHZ].n_bitrates =
|
||||
- ARRAY_SIZE(ath9k_legacy_rates);
|
||||
+ if (test_bit(ATH9K_MODE_11G, sc->sc_ah->caps.wireless_modes)) {
|
||||
+ sc->sbands[IEEE80211_BAND_2GHZ].channels = ath9k_2ghz_chantable;
|
||||
+ sc->sbands[IEEE80211_BAND_2GHZ].band = IEEE80211_BAND_2GHZ;
|
||||
+ sc->sbands[IEEE80211_BAND_2GHZ].n_channels =
|
||||
+ ARRAY_SIZE(ath9k_2ghz_chantable);
|
||||
+ sc->sbands[IEEE80211_BAND_2GHZ].bitrates = ath9k_legacy_rates;
|
||||
+ sc->sbands[IEEE80211_BAND_2GHZ].n_bitrates =
|
||||
+ ARRAY_SIZE(ath9k_legacy_rates);
|
||||
+ }
|
||||
|
||||
if (test_bit(ATH9K_MODE_11A, sc->sc_ah->caps.wireless_modes)) {
|
||||
sc->sbands[IEEE80211_BAND_5GHZ].channels = ath9k_5ghz_chantable;
|
||||
@@ -1886,8 +1888,9 @@ void ath_set_hw_capab(struct ath_softc *
|
||||
|
||||
hw->rate_control_algorithm = "ath9k_rate_control";
|
||||
|
||||
- hw->wiphy->bands[IEEE80211_BAND_2GHZ] =
|
||||
- &sc->sbands[IEEE80211_BAND_2GHZ];
|
||||
+ if (test_bit(ATH9K_MODE_11G, sc->sc_ah->caps.wireless_modes))
|
||||
+ hw->wiphy->bands[IEEE80211_BAND_2GHZ] =
|
||||
+ &sc->sbands[IEEE80211_BAND_2GHZ];
|
||||
if (test_bit(ATH9K_MODE_11A, sc->sc_ah->caps.wireless_modes))
|
||||
hw->wiphy->bands[IEEE80211_BAND_5GHZ] =
|
||||
&sc->sbands[IEEE80211_BAND_5GHZ];
|
||||
@@ -1926,9 +1929,12 @@ int ath_init_device(u16 devid, struct at
|
||||
reg = &common->regulatory;
|
||||
|
||||
if (ah->caps.hw_caps & ATH9K_HW_CAP_HT) {
|
||||
- setup_ht_cap(sc, &sc->sbands[IEEE80211_BAND_2GHZ].ht_cap);
|
||||
+ if (test_bit(ATH9K_MODE_11G, ah->caps.wireless_modes))
|
||||
+ setup_ht_cap(sc,
|
||||
+ &sc->sbands[IEEE80211_BAND_2GHZ].ht_cap);
|
||||
if (test_bit(ATH9K_MODE_11A, ah->caps.wireless_modes))
|
||||
- setup_ht_cap(sc, &sc->sbands[IEEE80211_BAND_5GHZ].ht_cap);
|
||||
+ setup_ht_cap(sc,
|
||||
+ &sc->sbands[IEEE80211_BAND_5GHZ].ht_cap);
|
||||
}
|
||||
|
||||
/* initialize tx/rx engine */
|
||||
Loading…
Reference in New Issue
Block a user