Changeset 41182


Ignore:
Timestamp:
2014-06-13T15:33:39+02:00 (4 years ago)
Author:
nbd
Message:

AA: mac80211: sync with trunk r41181

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

Location:
branches/attitude_adjustment/package/mac80211/patches
Files:
3 added
3 edited

Legend:

Unmodified
Added
Removed
  • branches/attitude_adjustment/package/mac80211/patches/300-pending_work.patch

    r41116 r41182  
     1commit 6e7341074823d2a45b81f2742cbf75f1da790031 
     2Author: Rafał Miłecki <zajec5@gmail.com> 
     3Date:   Sat May 31 19:40:45 2014 +0200 
     4 
     5    b43: disable 5 GHz on G-PHY 
     6     
     7    This fixes regression introduced by adding some G-PHY devices to the 
     8    list of dual band devices. There is simply no support for 5 GHz on 
     9    G-PHY devices in b43. It results in: 
     10    WARNING: CPU: 0 PID: 79 at drivers/net/wireless/b43/phy_g.c:75 b43_gphy_channel_switch+0x125/0x130 [b43]() 
     11    b43-phy1 ERROR: PHY init: Channel switch to default failed 
     12     
     13    Regression was introduced by the following commit: 
     14     
     15    commit 773cfc508f4d64c14547ff8751b5cbd473124364 
     16    Author: Rafał Miłecki <zajec5@gmail.com> 
     17    Date:   Mon May 19 23:18:55 2014 +0200 
     18     
     19        b43: add more devices to the bands database 
     20     
     21    Signed-off-by: Rafał Miłecki <zajec5@gmail.com> 
     22    Signed-off-by: John W. Linville <linville@tuxdriver.com> 
     23 
     24commit 1186edbef91f15722e5bdf56326ce0abc2935ce7 
     25Author: Stanislaw Gruszka <sgruszka@redhat.com> 
     26Date:   Tue Jun 10 12:51:06 2014 +0200 
     27 
     28    rt2x00: disable TKIP on USB 
     29     
     30    On USB we can not get atomically TKIP key. We have to disable support 
     31    for TKIP acceleration on USB hardware to avoid bug as showed bellow. 
     32     
     33    [  860.827243] BUG: scheduling while atomic: hostapd/3397/0x00000002 
     34    <snip> 
     35    [  860.827280] Call Trace: 
     36    [  860.827282]  [<ffffffff81682ea6>] dump_stack+0x4d/0x66 
     37    [  860.827284]  [<ffffffff8167eb9b>] __schedule_bug+0x47/0x55 
     38    [  860.827285]  [<ffffffff81685bb3>] __schedule+0x733/0x7b0 
     39    [  860.827287]  [<ffffffff81685c59>] schedule+0x29/0x70 
     40    [  860.827289]  [<ffffffff81684f8a>] schedule_timeout+0x15a/0x2b0 
     41    [  860.827291]  [<ffffffff8105ac50>] ? ftrace_raw_event_tick_stop+0xc0/0xc0 
     42    [  860.827294]  [<ffffffff810c13c2>] ? __module_text_address+0x12/0x70 
     43    [  860.827296]  [<ffffffff81686823>] wait_for_completion_timeout+0xb3/0x140 
     44    [  860.827298]  [<ffffffff81080fc0>] ? wake_up_state+0x20/0x20 
     45    [  860.827301]  [<ffffffff814d5b3d>] usb_start_wait_urb+0x7d/0x150 
     46    [  860.827303]  [<ffffffff814d5cd5>] usb_control_msg+0xc5/0x110 
     47    [  860.827305]  [<ffffffffa02fb0c6>] rt2x00usb_vendor_request+0xc6/0x160  [rt2x00usb] 
     48    [  860.827307]  [<ffffffffa02fb215>] rt2x00usb_vendor_req_buff_lock+0x75/0x150 [rt2x00usb] 
     49    [  860.827309]  [<ffffffffa02fb393>] rt2x00usb_vendor_request_buff+0xa3/0xe0 [rt2x00usb] 
     50    [  860.827311]  [<ffffffffa023d1a3>] rt2x00usb_register_multiread+0x33/0x40 [rt2800usb] 
     51    [  860.827314]  [<ffffffffa05805f9>] rt2800_get_tkip_seq+0x39/0x50  [rt2800lib] 
     52    [  860.827321]  [<ffffffffa0480f88>] ieee80211_get_key+0x218/0x2a0  [mac80211] 
     53    [  860.827322]  [<ffffffff815cc68c>] ? __nlmsg_put+0x6c/0x80 
     54    [  860.827329]  [<ffffffffa051b02e>] nl80211_get_key+0x22e/0x360 [cfg80211] 
     55     
     56    Cc: stable@vger.kernel.org 
     57    Reported-and-tested-by: Peter Wu <lekensteyn@gmail.com> 
     58    Reported-and-tested-by: Pontus Fuchs <pontus.fuchs@gmail.com> 
     59    Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com> 
     60    Signed-off-by: John W. Linville <linville@tuxdriver.com> 
     61 
     62commit 5f313a15da92dda80ac4c9a137bc42d7d0b49adf 
     63Author: Rafał Miłecki <zajec5@gmail.com> 
     64Date:   Thu Jun 12 09:28:38 2014 +0200 
     65 
     66    b43: fix frequency reported on G-PHY with /new/ firmware 
     67 
    168commit d3a58df87a2e4c2301ac843604202d290a48440b 
    269Author: Avraham Stern <avraham.stern@intel.com> 
     
    12381305--- a/drivers/net/wireless/rt2x00/rt2x00mac.c 
    12391306+++ b/drivers/net/wireless/rt2x00/rt2x00mac.c 
    1240 @@ -624,25 +624,24 @@ void rt2x00mac_bss_info_changed(struct i 
     1307@@ -487,6 +487,8 @@ int rt2x00mac_set_key(struct ieee80211_h 
     1308        crypto.cipher = rt2x00crypto_key_to_cipher(key); 
     1309        if (crypto.cipher == CIPHER_NONE) 
     1310                return -EOPNOTSUPP; 
     1311+       if (crypto.cipher == CIPHER_TKIP && rt2x00_is_usb(rt2x00dev)) 
     1312+               return -EOPNOTSUPP; 
     1313  
     1314        crypto.cmd = cmd; 
     1315  
     1316@@ -624,25 +626,24 @@ void rt2x00mac_bss_info_changed(struct i 
    12411317         * Start/stop beaconing. 
    12421318         */ 
     
    12711347                        rt2x00dev->intf_beaconing++; 
    12721348                        intf->enable_beacon = true; 
    1273 @@ -658,11 +657,10 @@ void rt2x00mac_bss_info_changed(struct i 
     1349@@ -658,11 +659,10 @@ void rt2x00mac_bss_info_changed(struct i 
    12741350                                 * First beaconing interface enabled 
    12751351                                 * -> start beacon queue. 
     
    27512827  
    27522828        return ret; 
     2829--- a/drivers/net/wireless/b43/xmit.c 
     2830+++ b/drivers/net/wireless/b43/xmit.c 
     2831@@ -811,9 +811,13 @@ void b43_rx(struct b43_wldev *dev, struc 
     2832                break; 
     2833        case B43_PHYTYPE_G: 
     2834                status.band = IEEE80211_BAND_2GHZ; 
     2835-               /* chanid is the radio channel cookie value as used 
     2836-                * to tune the radio. */ 
     2837-               status.freq = chanid + 2400; 
     2838+               /* Somewhere between 478.104 and 508.1084 firmware for G-PHY 
     2839+                * has been modified to be compatible with N-PHY and others. 
     2840+                */ 
     2841+               if (dev->fw.rev >= 508) 
     2842+                       status.freq = ieee80211_channel_to_frequency(chanid, status.band); 
     2843+               else 
     2844+                       status.freq = chanid + 2400; 
     2845                break; 
     2846        case B43_PHYTYPE_N: 
     2847        case B43_PHYTYPE_LP: 
     2848--- a/drivers/net/wireless/b43/main.c 
     2849+++ b/drivers/net/wireless/b43/main.c 
     2850@@ -5216,6 +5216,7 @@ static int b43_wireless_core_attach(stru 
     2851        /* We don't support 5 GHz on some PHYs yet */ 
     2852        switch (dev->phy.type) { 
     2853        case B43_PHYTYPE_A: 
     2854+       case B43_PHYTYPE_G: 
     2855        case B43_PHYTYPE_N: 
     2856        case B43_PHYTYPE_LP: 
     2857        case B43_PHYTYPE_HT: 
  • branches/attitude_adjustment/package/mac80211/patches/820-b43-add-antenna-control.patch

    r41116 r41182  
    100100  
    101101 /* Hard-reset the chip. Do not call this directly. 
    102 @@ -5295,6 +5335,8 @@ static int b43_one_core_attach(struct b4 
     102@@ -5296,6 +5336,8 @@ static int b43_one_core_attach(struct b4 
    103103        if (!wldev) 
    104104                goto out; 
     
    109109        wldev->dev = dev; 
    110110        wldev->wl = wl; 
    111 @@ -5385,6 +5427,9 @@ static struct b43_wl *b43_wireless_init( 
     111@@ -5386,6 +5428,9 @@ static struct b43_wl *b43_wireless_init( 
    112112  
    113113        hw->wiphy->flags |= WIPHY_FLAG_IBSS_RSN; 
  • branches/attitude_adjustment/package/mac80211/patches/a00-ath9k_platform_h_backup.patch

    r41116 r41182  
    11--- a/drivers/net/wireless/ath/ath9k/init.c 
    22+++ b/drivers/net/wireless/ath/ath9k/init.c 
    3 @@ -474,8 +474,7 @@ static int ath9k_init_soc_platform(struc 
     3@@ -477,8 +477,7 @@ static int ath9k_init_soc_platform(struc 
    44                        return ret; 
    55        } 
     
    1111        return ret; 
    1212 } 
    13 @@ -508,7 +507,7 @@ static int ath9k_init_softc(u16 devid, s 
     13@@ -511,7 +510,7 @@ static int ath9k_init_softc(u16 devid, s 
    1414        sc->tx99_power = MAX_RATE_POWER + 1; 
    1515        init_waitqueue_head(&sc->tx_wait); 
     
    4040--- a/drivers/net/wireless/ath/ath9k/pci.c 
    4141+++ b/drivers/net/wireless/ath/ath9k/pci.c 
    42 @@ -687,7 +687,7 @@ static bool ath_pci_eeprom_read(struct a 
     42@@ -693,7 +693,7 @@ static bool ath_pci_eeprom_read(struct a 
    4343        struct ath_softc *sc = (struct ath_softc *) common->priv; 
    4444        struct ath9k_platform_data *pdata = sc->dev->platform_data; 
Note: See TracChangeset for help on using the changeset viewer.