Changeset 25198


Ignore:
Timestamp:
2011-01-28T14:31:36+01:00 (5 years ago)
Author:
nbd
Message:

mac80211: backport 2011-01-24 from trunk

Location:
branches/backfire/package/mac80211
Files:
5 added
10 deleted
11 edited

Legend:

Unmodified
Added
Removed
  • branches/backfire/package/mac80211/Makefile

    r25061 r25198  
    1111PKG_NAME:=mac80211 
    1212 
    13 PKG_VERSION:=2011-01-05 
     13PKG_VERSION:=2011-01-24 
    1414PKG_RELEASE:=1 
    1515PKG_SOURCE_URL:=http://mirror2.openwrt.org/sources 
    16 PKG_MD5SUM:=2b87fdd08d95fa5def39f56f49c4906d 
     16PKG_MD5SUM:=c91b57972276b26824d4b18e927a9e5f 
    1717 
    1818PKG_SOURCE:=compat-wireless-$(PKG_VERSION).tar.bz2 
     
    992992        MODPROBE=: \ 
    993993        KLIB=$(TARGET_MODULES_DIR) \ 
    994         KERNEL_SUBLEVEL=$(lastword $(subst ., ,$(KERNEL_PATCHVER))) 
     994        KERNEL_SUBLEVEL=$(lastword $(subst ., ,$(KERNEL_PATCHVER))) \ 
     995        KBUILD_LDFLAGS_MODULE_PREREQ= 
    995996 
    996997ifeq ($(CONFIG_PACKAGE_kmod-libertas-sd)$(CONFIG_PACKAGE_kmod-libertas-usb)$(CONFIG_PACKAGE_kmod-rt2x00-lib),) 
  • branches/backfire/package/mac80211/patches/201-ath5k-WAR-for-AR71xx-PCI-bug.patch

    r24505 r25198  
    1010+#else 
    1111+       /* WAR for AR71xx PCI bug */ 
    12 +       { AR5K_TXCFG,           AR5K_DMASIZE_4B }, 
     12+       { AR5K_TXCFG,           AR5K_DMASIZE_128B }, 
    1313+       { AR5K_RXCFG,           AR5K_DMASIZE_4B }, 
    1414+#endif 
     
    3030+               /* WAR for AR71xx PCI bug */ 
    3131+               AR5K_REG_WRITE_BITS(ah, AR5K_TXCFG, 
    32 +                       AR5K_TXCFG_SDMAMR, AR5K_DMASIZE_4B); 
     32+                       AR5K_TXCFG_SDMAMR, AR5K_DMASIZE_128B); 
    3333+               AR5K_REG_WRITE_BITS(ah, AR5K_RXCFG, 
    3434+                       AR5K_RXCFG_SDMAMW, AR5K_DMASIZE_4B); 
  • branches/backfire/package/mac80211/patches/300-ath9k_gpio_settings.patch

    r24962 r25198  
    11--- a/drivers/net/wireless/ath/ath9k/debug.c 
    22+++ b/drivers/net/wireless/ath/ath9k/debug.c 
    3 @@ -927,6 +927,12 @@ int ath9k_init_debug(struct ath_hw *ah) 
     3@@ -1200,6 +1200,12 @@ int ath9k_init_debug(struct ath_hw *ah) 
    44                        sc->debug.debugfs_phy, &ah->config.cwm_ignore_extcca)) 
    55                goto err; 
     
    1616--- a/drivers/net/wireless/ath/ath9k/hw.h 
    1717+++ b/drivers/net/wireless/ath/ath9k/hw.h 
    18 @@ -791,6 +791,8 @@ struct ath_hw { 
     18@@ -795,6 +795,8 @@ struct ath_hw { 
    1919        int initPDADC; 
    2020        int PDADCdelta; 
     
    2727--- a/drivers/net/wireless/ath/ath9k/hw.c 
    2828+++ b/drivers/net/wireless/ath/ath9k/hw.c 
    29 @@ -1171,6 +1171,20 @@ static bool ath9k_hw_channel_change(stru 
     29@@ -1175,6 +1175,20 @@ static bool ath9k_hw_channel_change(stru 
    3030        return true; 
    3131 } 
     
    4848 { 
    4949        int count = 50; 
    50 @@ -1459,6 +1473,8 @@ int ath9k_hw_reset(struct ath_hw *ah, st 
     50@@ -1463,6 +1477,8 @@ int ath9k_hw_reset(struct ath_hw *ah, st 
    5151        if (AR_SREV_9300_20_OR_LATER(ah)) 
    5252                ar9003_hw_bb_watchdog_config(ah); 
  • branches/backfire/package/mac80211/patches/403-ath9k-fix-invalid-mac-address-handling.patch

    r24678 r25198  
    99  
    1010 #include "hw.h" 
    11 @@ -428,8 +429,16 @@ static int ath9k_hw_init_macaddr(struct  
     11@@ -431,8 +432,16 @@ static int ath9k_hw_init_macaddr(struct  
    1212                common->macaddr[2 * i] = eeval >> 8; 
    1313                common->macaddr[2 * i + 1] = eeval & 0xff; 
  • branches/backfire/package/mac80211/patches/407-ath9k-override-mac-address-from-platform-data.patch

    r24962 r25198  
    1919 #include "ath9k.h" 
    2020  
    21 @@ -528,6 +529,7 @@ static void ath9k_init_misc(struct ath_s 
     21@@ -526,6 +527,7 @@ static void ath9k_init_misc(struct ath_s 
    2222 static int ath9k_init_softc(u16 devid, struct ath_softc *sc, u16 subsysid, 
    2323                            const struct ath_bus_ops *bus_ops) 
     
    2727        struct ath_common *common; 
    2828        int ret = 0, i; 
    29 @@ -541,7 +543,7 @@ static int ath9k_init_softc(u16 devid, s 
     29@@ -540,7 +542,7 @@ static int ath9k_init_softc(u16 devid, s 
    3030        ah->hw_version.subsysid = subsysid; 
    3131        sc->sc_ah = ah; 
     
    3636  
    3737        common = ath9k_hw_common(ah); 
    38 @@ -574,6 +576,9 @@ static int ath9k_init_softc(u16 devid, s 
     38@@ -576,6 +578,9 @@ static int ath9k_init_softc(u16 devid, s 
    3939        if (ret) 
    4040                goto err_hw; 
  • branches/backfire/package/mac80211/patches/409-ath9k_platform_settings.patch

    r24962 r25198  
    11--- a/drivers/net/wireless/ath/ath9k/init.c 
    22+++ b/drivers/net/wireless/ath/ath9k/init.c 
    3 @@ -543,8 +543,14 @@ static int ath9k_init_softc(u16 devid, s 
     3@@ -542,8 +542,14 @@ static int ath9k_init_softc(u16 devid, s 
    44        ah->hw_version.subsysid = subsysid; 
    55        sc->sc_ah = ah; 
     
    1919--- a/drivers/net/wireless/ath/ath9k/hw.h 
    2020+++ b/drivers/net/wireless/ath/ath9k/hw.h 
    21 @@ -790,7 +790,7 @@ struct ath_hw { 
     21@@ -794,7 +794,7 @@ struct ath_hw { 
    2222        u32 originalGain[22]; 
    2323        int initPDADC; 
  • branches/backfire/package/mac80211/patches/451-add-platform-eeprom-support-to-ath5k.patch

    r24505 r25198  
    1010 #include "ath5k.h" 
    1111 #include "reg.h" 
    12 @@ -1726,7 +1728,7 @@ ath5k_eeprom_read_spur_chans(struct ath5 
     12@@ -1722,7 +1724,7 @@ ath5k_eeprom_read_spur_chans(struct ath5 
    1313 } 
    1414  
     
    1919 int ath5k_eeprom_read_mac(struct ath5k_hw *ah, u8 *mac) 
    2020 { 
    21 @@ -1734,6 +1736,16 @@ int ath5k_eeprom_read_mac(struct ath5k_h 
     21@@ -1730,6 +1732,16 @@ int ath5k_eeprom_read_mac(struct ath5k_h 
    2222        u32 total, offset; 
    2323        u16 data; 
    24         int octet, ret; 
     24        int octet; 
    2525+       struct ath5k_platform_data *pdata = NULL; 
    2626+ 
     
    3434+       } 
    3535  
    36         ret = ath5k_hw_nvram_read(ah, 0x20, &data); 
    37         if (ret) 
     36        AR5K_EEPROM_READ(0x20, data); 
     37  
    3838--- a/drivers/net/wireless/ath/ath5k/pci.c 
    3939+++ b/drivers/net/wireless/ath/ath5k/pci.c 
     
    4646 #include "ath5k.h" 
    4747 #include "debug.h" 
    48 @@ -73,6 +74,19 @@ bool ath5k_pci_eeprom_read(struct ath_co 
     48@@ -74,6 +75,19 @@ ath5k_pci_eeprom_read(struct ath_common  
    4949 { 
    5050        struct ath5k_hw *ah = (struct ath5k_hw *) common->ah; 
  • branches/backfire/package/mac80211/patches/500-ath9k_eeprom_debugfs.patch

    r24505 r25198  
    11--- a/drivers/net/wireless/ath/ath9k/debug.c 
    22+++ b/drivers/net/wireless/ath/ath9k/debug.c 
    3 @@ -871,6 +871,53 @@ static const struct file_operations fops 
     3@@ -1007,6 +1007,53 @@ static const struct file_operations fops 
    44        .llseek = default_llseek, 
    55 }; 
     
    5555 { 
    5656        struct ath_common *common = ath9k_hw_common(ah); 
    57 @@ -933,6 +980,10 @@ int ath9k_init_debug(struct ath_hw *ah) 
     57@@ -1077,6 +1124,10 @@ int ath9k_init_debug(struct ath_hw *ah) 
    5858        debugfs_create_u32("gpio_val", S_IRUSR | S_IWUSR, 
    5959                           sc->debug.debugfs_phy, &sc->sc_ah->gpio_val); 
  • branches/backfire/package/mac80211/patches/510-ath9k_led_cleanup.patch

    r24962 r25198  
    11--- a/drivers/net/wireless/ath/ath9k/ath9k.h 
    22+++ b/drivers/net/wireless/ath/ath9k/ath9k.h 
    3 @@ -441,26 +441,20 @@ void ath9k_btcoex_timer_pause(struct ath 
     3@@ -447,26 +447,20 @@ void ath9k_btcoex_timer_pause(struct ath 
    44  
    55 #define ATH_LED_PIN_DEF                1 
     
    3939 /* Antenna diversity/combining */ 
    4040 #define ATH_ANT_RX_CURRENT_SHIFT 4 
    41 @@ -611,15 +605,11 @@ struct ath_softc { 
     41@@ -618,15 +612,11 @@ struct ath_softc { 
    4242        struct ath_beacon beacon; 
    4343        struct ieee80211_supported_band sbands[IEEE80211_NUM_BANDS]; 
     
    5858+#endif 
    5959  
    60         int beacon_interval; 
    61   
     60        struct ath9k_hw_cal_data caldata; 
     61        int last_rssi; 
    6262--- a/drivers/net/wireless/ath/ath9k/gpio.c 
    6363+++ b/drivers/net/wireless/ath/ath9k/gpio.c 
     
    254254--- a/drivers/net/wireless/ath/ath9k/main.c 
    255255+++ b/drivers/net/wireless/ath/ath9k/main.c 
    256 @@ -1270,9 +1270,6 @@ static void ath9k_stop(struct ieee80211_ 
    257   
    258         aphy->state = ATH_WIPHY_INACTIVE; 
     256@@ -1259,9 +1259,6 @@ static void ath9k_stop(struct ieee80211_ 
     257  
     258        mutex_lock(&sc->mutex); 
    259259  
    260260-       if (led_blink) 
     
    288288  
    289289 /* 
    290 @@ -747,6 +762,13 @@ int ath9k_init_device(u16 devid, struct  
     290@@ -748,6 +763,13 @@ int ath9k_init_device(u16 devid, struct  
    291291  
    292292        ath9k_init_txpower_limits(sc); 
  • branches/backfire/package/mac80211/patches/520-ath9k_intr_mitigation_tweak.patch

    r24962 r25198  
    11--- a/drivers/net/wireless/ath/ath9k/hw.c 
    22+++ b/drivers/net/wireless/ath/ath9k/hw.c 
    3 @@ -1425,8 +1425,8 @@ int ath9k_hw_reset(struct ath_hw *ah, st 
     3@@ -1429,8 +1429,8 @@ int ath9k_hw_reset(struct ath_hw *ah, st 
    44        REG_WRITE(ah, AR_OBS, 8); 
    55  
  • branches/backfire/package/mac80211/patches/700-mwl8k-missing-pci-id-for-WNR854T.patch

    r24505 r25198  
    11--- a/drivers/net/wireless/mwl8k.c 
    22+++ b/drivers/net/wireless/mwl8k.c 
    3 @@ -4056,6 +4056,7 @@ MODULE_FIRMWARE("mwl8k/fmimage_8366.fw") 
     3@@ -4484,6 +4484,7 @@ MODULE_FIRMWARE("mwl8k/fmimage_8366.fw") 
    44 MODULE_FIRMWARE(MWL8K_8366_AP_FW(MWL8K_8366_AP_FW_API)); 
    55  
Note: See TracChangeset for help on using the changeset viewer.