Changeset 43208


Ignore:
Timestamp:
2014-11-07T12:12:51+01:00 (3 years ago)
Author:
nbd
Message:

mac80211: merge a few pending upstream fixes

Signed-off-by: Felix Fietkau <nbd@…>

Location:
trunk/package/kernel/mac80211/patches
Files:
6 added
1 deleted
7 edited

Legend:

Unmodified
Added
Removed
  • trunk/package/kernel/mac80211/patches/500-ath9k_eeprom_debugfs.patch

    r42952 r43208  
    11--- a/drivers/net/wireless/ath/ath9k/debug.c 
    22+++ b/drivers/net/wireless/ath/ath9k/debug.c 
    3 @@ -1313,6 +1313,53 @@ void ath9k_deinit_debug(struct ath_softc 
     3@@ -1314,6 +1314,53 @@ void ath9k_deinit_debug(struct ath_softc 
    44        ath9k_spectral_deinit_debug(sc); 
    55 } 
     
    5555 { 
    5656        struct ath_common *common = ath9k_hw_common(ah); 
    57 @@ -1332,6 +1379,8 @@ int ath9k_init_debug(struct ath_hw *ah) 
     57@@ -1333,6 +1380,8 @@ int ath9k_init_debug(struct ath_hw *ah) 
    5858        ath9k_tx99_init_debug(sc); 
    5959        ath9k_spectral_init_debug(sc); 
  • trunk/package/kernel/mac80211/patches/512-ath9k_channelbw_debugfs.patch

    r43028 r43208  
    11--- a/drivers/net/wireless/ath/ath9k/debug.c 
    22+++ b/drivers/net/wireless/ath/ath9k/debug.c 
    3 @@ -1360,6 +1360,52 @@ static const struct file_operations fops 
     3@@ -1361,6 +1361,52 @@ static const struct file_operations fops 
    44        .owner = THIS_MODULE 
    55 }; 
     
    5454 { 
    5555        struct ath_common *common = ath9k_hw_common(ah); 
    56 @@ -1381,6 +1427,8 @@ int ath9k_init_debug(struct ath_hw *ah) 
     56@@ -1382,6 +1428,8 @@ int ath9k_init_debug(struct ath_hw *ah) 
    5757  
    5858        debugfs_create_file("eeprom", S_IRUSR, sc->debug.debugfs_phy, sc, 
  • trunk/package/kernel/mac80211/patches/530-ath9k_extra_leds.patch

    r43032 r43208  
    174174--- a/drivers/net/wireless/ath/ath9k/debug.c 
    175175+++ b/drivers/net/wireless/ath/ath9k/debug.c 
    176 @@ -1405,6 +1405,61 @@ static const struct file_operations fops 
     176@@ -1406,6 +1406,61 @@ static const struct file_operations fops 
    177177        .llseek = default_llseek, 
    178178 }; 
     
    236236 int ath9k_init_debug(struct ath_hw *ah) 
    237237 { 
    238 @@ -1429,6 +1484,10 @@ int ath9k_init_debug(struct ath_hw *ah) 
     238@@ -1430,6 +1485,10 @@ int ath9k_init_debug(struct ath_hw *ah) 
    239239                            &fops_eeprom); 
    240240        debugfs_create_file("chanbw", S_IRUSR | S_IWUSR, sc->debug.debugfs_phy, 
  • trunk/package/kernel/mac80211/patches/542-ath9k_debugfs_diag.patch

    r43032 r43208  
    11--- a/drivers/net/wireless/ath/ath9k/debug.c 
    22+++ b/drivers/net/wireless/ath/ath9k/debug.c 
    3 @@ -1461,6 +1461,50 @@ static const struct file_operations fops 
     3@@ -1462,6 +1462,50 @@ static const struct file_operations fops 
    44 #endif 
    55  
     
    5252 { 
    5353        struct ath_common *common = ath9k_hw_common(ah); 
    54 @@ -1488,6 +1532,8 @@ int ath9k_init_debug(struct ath_hw *ah) 
     54@@ -1489,6 +1533,8 @@ int ath9k_init_debug(struct ath_hw *ah) 
    5555        debugfs_create_file("gpio_led", S_IWUSR, 
    5656                           sc->debug.debugfs_phy, sc, &fops_gpio_led); 
     
    9595--- a/drivers/net/wireless/ath/ath9k/hw.c 
    9696+++ b/drivers/net/wireless/ath/ath9k/hw.c 
    97 @@ -1766,6 +1766,20 @@ u32 ath9k_hw_get_tsf_offset(struct times 
     97@@ -1753,6 +1753,20 @@ u32 ath9k_hw_get_tsf_offset(struct times 
    9898 } 
    9999 EXPORT_SYMBOL(ath9k_hw_get_tsf_offset); 
     
    116116                   struct ath9k_hw_cal_data *caldata, bool fastcc) 
    117117 { 
    118 @@ -1970,6 +1984,7 @@ int ath9k_hw_reset(struct ath_hw *ah, st 
     118@@ -1957,6 +1971,7 @@ int ath9k_hw_reset(struct ath_hw *ah, st 
    119119                ar9003_hw_disable_phy_restart(ah); 
    120120  
  • trunk/package/kernel/mac80211/patches/543-ath9k_entropy_from_adc.patch

    r43032 r43208  
    1919--- a/drivers/net/wireless/ath/ath9k/ar9003_phy.c 
    2020+++ b/drivers/net/wireless/ath/ath9k/ar9003_phy.c 
    21 @@ -1783,6 +1783,26 @@ static void ar9003_hw_tx99_set_txpower(s 
     21@@ -1796,6 +1796,26 @@ static void ar9003_hw_tx99_set_txpower(s 
    2222                  ATH9K_POW_SM(p_pwr_array[ALL_TARGET_HT40_14],  0)); 
    2323 } 
     
    4646 { 
    4747        struct ath_hw_private_ops *priv_ops = ath9k_hw_private_ops(ah); 
    48 @@ -1818,6 +1838,7 @@ void ar9003_hw_attach_phy_ops(struct ath 
     48@@ -1831,6 +1851,7 @@ void ar9003_hw_attach_phy_ops(struct ath 
    4949        priv_ops->set_radar_params = ar9003_hw_set_radar_params; 
    5050        priv_ops->fast_chan_change = ar9003_hw_fast_chan_change; 
  • trunk/package/kernel/mac80211/patches/544-ath9k-ar933x-usb-hang-workaround.patch

    r42952 r43208  
    2121 /* Chip Revisions */ 
    2222 /******************/ 
    23 @@ -1351,6 +1364,9 @@ static bool ath9k_hw_set_reset(struct at 
     23@@ -1338,6 +1351,9 @@ static bool ath9k_hw_set_reset(struct at 
    2424        if (AR_SREV_9100(ah)) 
    2525                udelay(50); 
     
    3131 } 
    3232  
    33 @@ -1450,6 +1466,9 @@ static bool ath9k_hw_chip_reset(struct a 
     33@@ -1437,6 +1453,9 @@ static bool ath9k_hw_chip_reset(struct a 
    3434                ar9003_hw_internal_regulator_apply(ah); 
    3535        ath9k_hw_init_pll(ah, chan); 
     
    4141 } 
    4242  
    43 @@ -1744,8 +1763,14 @@ static int ath9k_hw_do_fastcc(struct ath 
     43@@ -1731,8 +1750,14 @@ static int ath9k_hw_do_fastcc(struct ath 
    4444        if (AR_SREV_9271(ah)) 
    4545                ar9002_hw_load_ani_reg(ah, chan); 
     
    5656 } 
    5757  
    58 @@ -1995,6 +2020,9 @@ int ath9k_hw_reset(struct ath_hw *ah, st 
     58@@ -1982,6 +2007,9 @@ int ath9k_hw_reset(struct ath_hw *ah, st 
    5959                ath9k_hw_set_radar_params(ah); 
    6060        } 
  • trunk/package/kernel/mac80211/patches/545-ath9k_ani_ws_detect.patch

    r42952 r43208  
    8080  * ar9003_hw_set_channel - set channel on single-chip device 
    8181  * @ah: atheros hardware structure 
    82 @@ -971,11 +957,6 @@ static bool ar9003_hw_ani_control(struct 
     82@@ -984,11 +970,6 @@ static bool ar9003_hw_ani_control(struct 
    8383        struct ath_common *common = ath9k_hw_common(ah); 
    8484        struct ath9k_channel *chan = ah->curchan; 
     
    9292  
    9393        switch (cmd & ah->ani_function) { 
    94 @@ -989,61 +970,6 @@ static bool ar9003_hw_ani_control(struct 
     94@@ -1002,61 +983,6 @@ static bool ar9003_hw_ani_control(struct 
    9595                 */ 
    9696                u32 on = param ? 1 : 0; 
Note: See TracChangeset for help on using the changeset viewer.