diff options
| author | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2010-12-11 01:45:12 +0000 |
|---|---|---|
| committer | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2010-12-11 01:45:12 +0000 |
| commit | 83cc2deba9a07c5fc3bee9c8c973721bc374d734 (patch) | |
| tree | 995c0aad8f68eaf037d80be2c55fd5920ac4b253 /package/mac80211/patches/409-ath9k_platform_settings.patch | |
| parent | 99a212a2565ed4c256d86645d14ff7064f284f2d (diff) | |
mac80211: update to 2010-12-09
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@24471 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/mac80211/patches/409-ath9k_platform_settings.patch')
| -rw-r--r-- | package/mac80211/patches/409-ath9k_platform_settings.patch | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/package/mac80211/patches/409-ath9k_platform_settings.patch b/package/mac80211/patches/409-ath9k_platform_settings.patch index 7f09b05fb..7b56ee23d 100644 --- a/package/mac80211/patches/409-ath9k_platform_settings.patch +++ b/package/mac80211/patches/409-ath9k_platform_settings.patch @@ -1,15 +1,14 @@ --- a/drivers/net/wireless/ath/ath9k/init.c +++ b/drivers/net/wireless/ath/ath9k/init.c -@@ -536,8 +536,15 @@ static int ath9k_init_softc(u16 devid, s +@@ -537,8 +537,14 @@ static int ath9k_init_softc(u16 devid, s ah->hw_version.subsysid = subsysid; sc->sc_ah = ah; -- if (!sc->dev->platform_data) -+ if (!sc->dev->platform_data) { +- if (!pdata) ++ if (!pdata) { ah->ah_flags |= AH_USE_EEPROM; + sc->sc_ah->led_pin = -1; + } else { -+ pdata = (struct ath9k_platform_data *) sc->dev->platform_data; + sc->sc_ah->gpio_mask = pdata->gpio_mask; + sc->sc_ah->gpio_val = pdata->gpio_val; + sc->sc_ah->led_pin = pdata->led_pin; @@ -19,7 +18,7 @@ common->ops = &ath9k_common_ops; --- a/drivers/net/wireless/ath/ath9k/hw.h +++ b/drivers/net/wireless/ath/ath9k/hw.h -@@ -782,7 +782,7 @@ struct ath_hw { +@@ -794,7 +794,7 @@ struct ath_hw { u32 originalGain[22]; int initPDADC; int PDADCdelta; |