mac80211: merge a big batch of upstream changes/improvements

Signed-off-by: Felix Fietkau <nbd@openwrt.org>

SVN-Revision: 37918
This commit is contained in:
Felix Fietkau
2013-09-08 09:38:32 +00:00
parent f39f07cd09
commit 249c396583
26 changed files with 5091 additions and 203 deletions

View File

@@ -71,7 +71,7 @@
--- a/drivers/net/wireless/ath/ath9k/hw.h
+++ b/drivers/net/wireless/ath/ath9k/hw.h
@@ -739,6 +739,7 @@ enum ath_cal_list {
@@ -747,6 +747,7 @@ enum ath_cal_list {
#define AH_USE_EEPROM 0x1
#define AH_UNPLUGGED 0x2 /* The card has been physically removed. */
#define AH_FASTCC 0x4
@@ -81,7 +81,7 @@
struct ath_ops reg_ops;
--- a/drivers/net/wireless/ath/ath9k/init.c
+++ b/drivers/net/wireless/ath/ath9k/init.c
@@ -613,6 +613,8 @@ static int ath9k_init_softc(u16 devid, s
@@ -631,6 +631,8 @@ static int ath9k_init_softc(u16 devid, s
ah->is_clk_25mhz = pdata->is_clk_25mhz;
ah->get_mac_revision = pdata->get_mac_revision;
ah->external_reset = pdata->external_reset;