diff options
author | Felix Fietkau <nbd@openwrt.org> | 2014-06-11 12:30:50 +0000 |
---|---|---|
committer | Felix Fietkau <nbd@openwrt.org> | 2014-06-11 12:30:50 +0000 |
commit | 3153b7589c0831fdce97081d1ecf5b9310725576 (patch) | |
tree | 5e4608250807827642c1d1fb19849d3671443ae7 /package/mac80211/patches/a00-ath9k_platform_h_backup.patch | |
parent | 312a176995ecf1b1b97a048451e4ff28b4336f85 (diff) | |
download | upstream-3153b7589c0831fdce97081d1ecf5b9310725576.tar.gz upstream-3153b7589c0831fdce97081d1ecf5b9310725576.tar.bz2 upstream-3153b7589c0831fdce97081d1ecf5b9310725576.zip |
AA: mac80211: sync with trunk r41113
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/branches/attitude_adjustment@41116 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/mac80211/patches/a00-ath9k_platform_h_backup.patch')
-rw-r--r-- | package/mac80211/patches/a00-ath9k_platform_h_backup.patch | 32 |
1 files changed, 30 insertions, 2 deletions
diff --git a/package/mac80211/patches/a00-ath9k_platform_h_backup.patch b/package/mac80211/patches/a00-ath9k_platform_h_backup.patch index cff3daee82..fb870ceacf 100644 --- a/package/mac80211/patches/a00-ath9k_platform_h_backup.patch +++ b/package/mac80211/patches/a00-ath9k_platform_h_backup.patch @@ -1,6 +1,6 @@ --- a/drivers/net/wireless/ath/ath9k/init.c +++ b/drivers/net/wireless/ath/ath9k/init.c -@@ -678,8 +678,7 @@ static int ath9k_init_soc_platform(struc +@@ -474,8 +474,7 @@ static int ath9k_init_soc_platform(struc return ret; } @@ -10,9 +10,18 @@ return ret; } +@@ -508,7 +507,7 @@ static int ath9k_init_softc(u16 devid, s + sc->tx99_power = MAX_RATE_POWER + 1; + init_waitqueue_head(&sc->tx_wait); + +- if (!pdata || pdata->use_eeprom) { ++ if (!pdata) { + ah->ah_flags |= AH_USE_EEPROM; + sc->sc_ah->led_pin = -1; + } else { --- a/include/linux/ath9k_platform.h +++ b/include/linux/ath9k_platform.h -@@ -33,7 +33,6 @@ struct ath9k_platform_data { +@@ -33,15 +33,12 @@ struct ath9k_platform_data { bool endian_check; bool is_clk_25mhz; @@ -20,3 +29,22 @@ bool disable_2ghz; bool disable_5ghz; + int (*get_mac_revision)(void); + int (*external_reset)(void); + +- bool use_eeprom; +- + int num_leds; + const struct gpio_led *leds; + }; +--- a/drivers/net/wireless/ath/ath9k/pci.c ++++ b/drivers/net/wireless/ath/ath9k/pci.c +@@ -687,7 +687,7 @@ static bool ath_pci_eeprom_read(struct a + struct ath_softc *sc = (struct ath_softc *) common->priv; + struct ath9k_platform_data *pdata = sc->dev->platform_data; + +- if (pdata && !pdata->use_eeprom) { ++ if (pdata) { + if (off >= (ARRAY_SIZE(pdata->eeprom_data))) { + ath_err(common, + "%s: eeprom read failed, offset %08x is out of range\n", |