Changeset 34464


Ignore:
Timestamp:
2012-12-02T21:41:39+01:00 (5 years ago)
Author:
juhosg
Message:

mac80211: refresh patches

Signed-off-by: Gabor Juhos <juhosg@…>

Location:
trunk/package/mac80211/patches
Files:
18 edited

Legend:

Unmodified
Added
Removed
  • trunk/package/mac80211/patches/130-mesh_pathtbl_backport.patch

    r33989 r34464  
    11--- a/net/mac80211/mesh_pathtbl.c 
    22+++ b/net/mac80211/mesh_pathtbl.c 
    3 @@ -813,7 +813,6 @@ static void table_flush_by_iface(struct  
     3@@ -813,7 +813,6 @@ static void table_flush_by_iface(struct 
    44        struct hlist_node *p; 
    55        int i; 
  • trunk/package/mac80211/patches/300-pending_work.patch

    r34133 r34464  
    190190 { 
    191191        struct ieee80211_sub_if_data *sdata = 
    192 @@ -1101,6 +1144,9 @@ static void ieee80211_iface_work(struct  
     192@@ -1101,6 +1144,9 @@ static void ieee80211_iface_work(struct 
    193193                                break; 
    194194                        ieee80211_mesh_rx_queued_mgmt(sdata, skb); 
     
    267267--- a/net/mac80211/status.c 
    268268+++ b/net/mac80211/status.c 
    269 @@ -34,7 +34,7 @@ void ieee80211_tx_status_irqsafe(struct  
     269@@ -34,7 +34,7 @@ void ieee80211_tx_status_irqsafe(struct 
    270270                skb_queue_len(&local->skb_queue_unreliable); 
    271271        while (tmp > IEEE80211_IRQSAFE_QUEUE_LIMIT && 
     
    848848--- a/drivers/net/wireless/ath/ath9k/xmit.c 
    849849+++ b/drivers/net/wireless/ath/ath9k/xmit.c 
    850 @@ -386,7 +386,7 @@ static void ath_tx_complete_aggr(struct  
     850@@ -386,7 +386,7 @@ static void ath_tx_complete_aggr(struct 
    851851        u16 seq_st = 0, acked_cnt = 0, txfail_cnt = 0, seq_first; 
    852852        u32 ba[WME_BA_BMP_SIZE >> 5]; 
     
    857857        struct ath_frame_info *fi; 
    858858        int nframes; 
    859 @@ -430,13 +430,17 @@ static void ath_tx_complete_aggr(struct  
     859@@ -430,13 +430,17 @@ static void ath_tx_complete_aggr(struct 
    860860        tidno = ieee80211_get_qos_ctl(hdr)[0] & IEEE80211_QOS_CTL_TID_MASK; 
    861861        tid = ATH_AN_2_TID(an, tidno); 
     
    890890--- a/net/mac80211/tx.c 
    891891+++ b/net/mac80211/tx.c 
    892 @@ -354,7 +354,7 @@ static void purge_old_ps_buffers(struct  
     892@@ -354,7 +354,7 @@ static void purge_old_ps_buffers(struct 
    893893                        total += skb_queue_len(&sta->ps_tx_buf[ac]); 
    894894                        if (skb) { 
     
    985985  
    986986 /* 
    987 @@ -2190,7 +2195,7 @@ void ieee80211_tx_pending(unsigned long  
     987@@ -2190,7 +2195,7 @@ void ieee80211_tx_pending(unsigned long 
    988988                        struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb); 
    989989  
  • trunk/package/mac80211/patches/402-ath9k-fix-invalid-mac-address-handling.patch

    r33583 r34464  
    99  
    1010 #include "hw.h" 
    11 @@ -523,8 +524,16 @@ static int ath9k_hw_init_macaddr(struct  
     11@@ -523,8 +524,16 @@ static int ath9k_hw_init_macaddr(struct 
    1212                common->macaddr[2 * i] = eeval >> 8; 
    1313                common->macaddr[2 * i + 1] = eeval & 0xff; 
  • trunk/package/mac80211/patches/411-ath5k_allow_adhoc_and_ap.patch

    r33583 r34464  
    11--- a/drivers/net/wireless/ath/ath5k/mac80211-ops.c 
    22+++ b/drivers/net/wireless/ath/ath5k/mac80211-ops.c 
    3 @@ -89,13 +89,8 @@ ath5k_add_interface(struct ieee80211_hw  
     3@@ -89,13 +89,8 @@ ath5k_add_interface(struct ieee80211_hw 
    44                goto end; 
    55        } 
  • trunk/package/mac80211/patches/431-add_platform_eeprom_support_to_ath5k.patch

    r33583 r34464  
    1818 static bool 
    1919 ath5k_pci_eeprom_read(struct ath_common *common, u32 offset, u16 *data) 
    20 @@ -82,6 +83,19 @@ ath5k_pci_eeprom_read(struct ath_common  
     20@@ -82,6 +83,19 @@ ath5k_pci_eeprom_read(struct ath_common 
    2121        struct ath5k_hw *ah = (struct ath5k_hw *) common->ah; 
    2222        u32 status, timeout; 
  • trunk/package/mac80211/patches/440-ath5k_channel_bw_debugfs.patch

    r33583 r34464  
    102102 /* debugfs: queues etc */ 
    103103  
    104 @@ -904,6 +987,9 @@ ath5k_debug_init_device(struct ath5k_hw  
     104@@ -904,6 +987,9 @@ ath5k_debug_init_device(struct ath5k_hw 
    105105        debugfs_create_file("beacon", S_IWUSR | S_IRUSR, phydir, ah, 
    106106                            &fops_beacon); 
  • trunk/package/mac80211/patches/522-ath9k_per_chain_signal_strength.patch

    r33583 r34464  
    167167--- a/drivers/net/wireless/ath/ath9k/ar9003_mac.c 
    168168+++ b/drivers/net/wireless/ath/ath9k/ar9003_mac.c 
    169 @@ -458,12 +458,12 @@ int ath9k_hw_process_rxdesc_edma(struct  
     169@@ -458,12 +458,12 @@ int ath9k_hw_process_rxdesc_edma(struct 
    170170  
    171171        /* XXX: Keycache */ 
     
    228228--- a/drivers/net/wireless/ath/ath9k/debug.c 
    229229+++ b/drivers/net/wireless/ath/ath9k/debug.c 
    230 @@ -997,12 +997,12 @@ void ath_debug_stat_rx(struct ath_softc  
     230@@ -997,12 +997,12 @@ void ath_debug_stat_rx(struct ath_softc 
    231231 #ifdef CONFIG_ATH9K_MAC_DEBUG 
    232232        spin_lock(&sc->debug.samp_lock); 
     
    364364--- a/drivers/net/wireless/ath/ath9k/antenna.c 
    365365+++ b/drivers/net/wireless/ath/ath9k/antenna.c 
    366 @@ -529,14 +529,14 @@ void ath_ant_comb_scan(struct ath_softc  
     366@@ -529,14 +529,14 @@ void ath_ant_comb_scan(struct ath_softc 
    367367        struct ath_ant_comb *antcomb = &sc->ant_comb; 
    368368        int alt_ratio = 0, alt_rssi_avg = 0, main_rssi_avg = 0, curr_alt_set; 
  • trunk/package/mac80211/patches/523-cfg80211_fix_antenna_gain.patch

    r33585 r34464  
    11--- a/net/wireless/reg.c 
    22+++ b/net/wireless/reg.c 
    3 @@ -908,8 +908,7 @@ static void handle_channel(struct wiphy  
     3@@ -908,8 +908,7 @@ static void handle_channel(struct wiphy 
    44  
    55        chan->beacon_found = false; 
  • trunk/package/mac80211/patches/524-mac80211_configure_antenna_gain.patch

    r34030 r34464  
    107107  
    108108 /* policy for the key attributes */ 
    109 @@ -1604,6 +1605,22 @@ static int nl80211_set_wiphy(struct sk_b 
     109@@ -1603,6 +1604,22 @@ static int nl80211_set_wiphy(struct sk_b 
     110                if (result) 
    110111                        goto bad_res; 
    111112        } 
    112   
     113+ 
    113114+       if (info->attrs[NL80211_ATTR_WIPHY_ANTENNA_GAIN]) { 
    114115+               int idx, dbi = 0; 
     
    126127+                       goto bad_res; 
    127128+       } 
    128 + 
     129  
    129130        if (info->attrs[NL80211_ATTR_WIPHY_ANTENNA_TX] && 
    130131            info->attrs[NL80211_ATTR_WIPHY_ANTENNA_RX]) { 
    131                 u32 tx_ant, rx_ant; 
    132132--- a/net/mac80211/cfg.c 
    133133+++ b/net/mac80211/cfg.c 
     
    152152                                  const u8 *addr) 
    153153 { 
    154 @@ -3085,6 +3098,7 @@ struct cfg80211_ops mac80211_config_ops  
     154@@ -3085,6 +3098,7 @@ struct cfg80211_ops mac80211_config_ops 
    155155        .set_wiphy_params = ieee80211_set_wiphy_params, 
    156156        .set_tx_power = ieee80211_set_tx_power, 
  • trunk/package/mac80211/patches/526-cfg80211_fix_max_reg_power.patch

    r33610 r34464  
    11--- a/net/wireless/reg.c 
    22+++ b/net/wireless/reg.c 
    3 @@ -901,7 +901,7 @@ static void handle_channel(struct wiphy  
     3@@ -901,7 +901,7 @@ static void handle_channel(struct wiphy 
    44                        map_regdom_flags(reg_rule->flags) | bw_flags; 
    55                chan->max_antenna_gain = chan->orig_mag = 
  • trunk/package/mac80211/patches/540-ath9k_extra_leds.patch

    r33583 r34464  
    172172--- a/drivers/net/wireless/ath/ath9k/init.c 
    173173+++ b/drivers/net/wireless/ath/ath9k/init.c 
    174 @@ -811,7 +811,7 @@ int ath9k_init_device(u16 devid, struct  
     174@@ -811,7 +811,7 @@ int ath9k_init_device(u16 devid, struct 
    175175  
    176176 #ifdef CONFIG_MAC80211_LEDS 
  • trunk/package/mac80211/patches/563-ath9k_rx_dma_stop_check.patch

    r33583 r34464  
    11--- a/drivers/net/wireless/ath/ath9k/mac.c 
    22+++ b/drivers/net/wireless/ath/ath9k/mac.c 
    3 @@ -689,7 +689,7 @@ bool ath9k_hw_stopdmarecv(struct ath_hw  
     3@@ -689,7 +689,7 @@ bool ath9k_hw_stopdmarecv(struct ath_hw 
    44 { 
    55 #define AH_RX_STOP_DMA_TIMEOUT 10000   /* usec */ 
     
    1010  
    1111        /* Enable access to the DMA observation bus */ 
    12 @@ -719,6 +719,16 @@ bool ath9k_hw_stopdmarecv(struct ath_hw  
     12@@ -719,6 +719,16 @@ bool ath9k_hw_stopdmarecv(struct ath_hw 
    1313        } 
    1414  
  • trunk/package/mac80211/patches/603-rt2x00-introduce-rt2x00eeprom.patch

    r33583 r34464  
    187187--- a/drivers/net/wireless/rt2x00/rt2800pci.c 
    188188+++ b/drivers/net/wireless/rt2x00/rt2800pci.c 
    189 @@ -89,20 +89,10 @@ static void rt2800pci_mcu_status(struct  
     189@@ -89,20 +89,10 @@ static void rt2800pci_mcu_status(struct 
    190190        rt2x00pci_register_write(rt2x00dev, H2M_MAILBOX_CID, ~0); 
    191191 } 
     
    199199- 
    200200-       iounmap(base_addr); 
    201 +       memcpy(rt2x00dev->eeprom, rt2x00dev->eeprom_file->data, EEPROM_SIZE); 
    202  } 
     201-} 
    203202-#else 
    204203-static inline void rt2800pci_read_eeprom_soc(struct rt2x00_dev *rt2x00dev) 
    205204-{ 
    206 -} 
     205+       memcpy(rt2x00dev->eeprom, rt2x00dev->eeprom_file->data, EEPROM_SIZE); 
     206 } 
    207207-#endif /* CONFIG_RALINK_RT288X || CONFIG_RALINK_RT305X */ 
    208208  
  • trunk/package/mac80211/patches/605-rt2x00-pci-eeprom.patch

    r33583 r34464  
    11--- a/drivers/net/wireless/rt2x00/rt2800pci.c 
    22+++ b/drivers/net/wireless/rt2x00/rt2800pci.c 
    3 @@ -89,7 +89,7 @@ static void rt2800pci_mcu_status(struct  
     3@@ -89,7 +89,7 @@ static void rt2800pci_mcu_status(struct 
    44        rt2x00pci_register_write(rt2x00dev, H2M_MAILBOX_CID, ~0); 
    55 } 
  • trunk/package/mac80211/patches/620-rt2x00-support-rt3352.patch

    r33636 r34464  
    158158  
    159159 static int rt2800_get_gain_calibration_delta(struct rt2x00_dev *rt2x00dev) 
    160 @@ -2998,6 +3073,10 @@ static int rt2800_init_registers(struct  
     160@@ -2998,6 +3073,10 @@ static int rt2800_init_registers(struct 
    161161                rt2800_register_write(rt2x00dev, TX_SW_CFG0, 0x00000400); 
    162162                rt2800_register_write(rt2x00dev, TX_SW_CFG1, 0x00000000); 
  • trunk/package/mac80211/patches/623-rt2x00-rf_vals-rt3352-xtal20.patch

    r34269 r34464  
    1 Index: compat-wireless-2012-09-07/drivers/net/wireless/rt2x00/rt2800lib.c 
    2 =================================================================== 
    3 --- compat-wireless-2012-09-07.orig/drivers/net/wireless/rt2x00/rt2800lib.c 
    4 +++ compat-wireless-2012-09-07/drivers/net/wireless/rt2x00/rt2800lib.c 
     1--- a/drivers/net/wireless/rt2x00/rt2800lib.c 
     2+++ b/drivers/net/wireless/rt2x00/rt2800lib.c 
    53@@ -5072,6 +5072,27 @@ static const struct rf_channel rf_vals_3 
    64        {173, 0x61, 0, 9}, 
     
    8886         */ 
    8987        retval = rt2800_probe_hw_mode(rt2x00dev); 
    90 Index: compat-wireless-2012-09-07/drivers/net/wireless/rt2x00/rt2x00.h 
    91 =================================================================== 
    92 --- compat-wireless-2012-09-07.orig/drivers/net/wireless/rt2x00/rt2x00.h 
    93 +++ compat-wireless-2012-09-07/drivers/net/wireless/rt2x00/rt2x00.h 
     88--- a/drivers/net/wireless/rt2x00/rt2x00.h 
     89+++ b/drivers/net/wireless/rt2x00/rt2x00.h 
    9490@@ -421,6 +421,7 @@ static inline struct rt2x00_intf* vif_to 
    9591  * @channels: Device/chipset specific channel values (See &struct rf_channel). 
     
    108104  
    109105 /* 
    110 Index: compat-wireless-2012-09-07/include/linux/rt2x00_platform.h 
    111 =================================================================== 
    112 --- compat-wireless-2012-09-07.orig/include/linux/rt2x00_platform.h 
    113 +++ compat-wireless-2012-09-07/include/linux/rt2x00_platform.h 
     106--- a/include/linux/rt2x00_platform.h 
     107+++ b/include/linux/rt2x00_platform.h 
    114108@@ -18,6 +18,7 @@ struct rt2x00_platform_data { 
    115109  
  • trunk/package/mac80211/patches/849-brcmsmac-add-device-found-on-some-SoCs-like-the-bcm4.patch

    r33669 r34464  
    1111--- a/drivers/net/wireless/brcm80211/brcmsmac/main.c 
    1212+++ b/drivers/net/wireless/brcm80211/brcmsmac/main.c 
    13 @@ -734,7 +734,7 @@ static void brcms_c_ucode_bsinit(struct  
     13@@ -734,7 +734,7 @@ static void brcms_c_ucode_bsinit(struct 
    1414        brcms_c_write_mhf(wlc_hw, wlc_hw->band->mhfs); 
    1515  
     
    2020                        brcms_c_write_inits(wlc_hw, ucode->d11n0bsinitvals16); 
    2121                else 
    22 @@ -2259,7 +2259,7 @@ static void brcms_ucode_download(struct  
     22@@ -2259,7 +2259,7 @@ static void brcms_ucode_download(struct 
    2323        if (wlc_hw->ucode_loaded) 
    2424                return; 
  • trunk/package/mac80211/patches/851-brcmsmac-start-adding-support-for-core-rev-28.patch

    r33821 r34464  
    1111--- a/drivers/net/wireless/brcm80211/brcmsmac/main.c 
    1212+++ b/drivers/net/wireless/brcm80211/brcmsmac/main.c 
    13 @@ -734,7 +734,7 @@ static void brcms_c_ucode_bsinit(struct  
     13@@ -734,7 +734,7 @@ static void brcms_c_ucode_bsinit(struct 
    1414        brcms_c_write_mhf(wlc_hw, wlc_hw->band->mhfs); 
    1515  
     
    2020                        brcms_c_write_inits(wlc_hw, ucode->d11n0bsinitvals16); 
    2121                else 
    22 @@ -2259,7 +2259,7 @@ static void brcms_ucode_download(struct  
     22@@ -2259,7 +2259,7 @@ static void brcms_ucode_download(struct 
    2323        if (wlc_hw->ucode_loaded) 
    2424                return; 
Note: See TracChangeset for help on using the changeset viewer.