diff options
author | Hauke Mehrtens <hauke@hauke-m.de> | 2014-07-10 22:35:13 +0200 |
---|---|---|
committer | Hauke Mehrtens <hauke@hauke-m.de> | 2014-07-23 23:33:22 +0200 |
commit | a7176940b9685a32c8172297c7f5ee369049067a (patch) | |
tree | 675f88182a9460c204f55f6c014b15ef2592a506 /patches/collateral-evolutions/network/0011-mac80211-disable-tx-status | |
parent | 5fb6e1a4be888d612f36bdbc61824a820681d943 (diff) |
backports: refresh patches on next-20140710backports-20140710
1 3.0.101 [ OK ]
2 3.1.10 [ OK ]
3 3.2.60 [ OK ]
4 3.3.8 [ OK ]
5 3.4.93 [ OK ]
6 3.5.7 [ OK ]
7 3.6.11 [ OK ]
8 3.7.10 [ OK ]
9 3.8.13 [ OK ]
10 3.9.11 [ OK ]
11 3.10.43 [ OK ]
12 3.11.10 [ OK ]
13 3.12.22 [ OK ]
14 3.13.11 [ OK ]
15 3.14.7 [ OK ]
16 3.15.0 [ OK ]
17 3.16-rc1 [ OK ]
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Diffstat (limited to 'patches/collateral-evolutions/network/0011-mac80211-disable-tx-status')
-rw-r--r-- | patches/collateral-evolutions/network/0011-mac80211-disable-tx-status/net_mac80211_tx.patch | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/patches/collateral-evolutions/network/0011-mac80211-disable-tx-status/net_mac80211_tx.patch b/patches/collateral-evolutions/network/0011-mac80211-disable-tx-status/net_mac80211_tx.patch index e481d681..05c45655 100644 --- a/patches/collateral-evolutions/network/0011-mac80211-disable-tx-status/net_mac80211_tx.patch +++ b/patches/collateral-evolutions/network/0011-mac80211-disable-tx-status/net_mac80211_tx.patch @@ -1,6 +1,6 @@ --- a/net/mac80211/tx.c +++ b/net/mac80211/tx.c -@@ -2065,6 +2065,7 @@ netdev_tx_t ieee80211_subif_start_xmit(s +@@ -2067,6 +2067,7 @@ netdev_tx_t ieee80211_subif_start_xmit(s goto fail_rcu; } @@ -8,7 +8,7 @@ if (unlikely(!multicast && skb->sk && skb_shinfo(skb)->tx_flags & SKBTX_WIFI_STATUS)) { struct sk_buff *orig_skb = skb; -@@ -2093,6 +2094,7 @@ netdev_tx_t ieee80211_subif_start_xmit(s +@@ -2095,6 +2096,7 @@ netdev_tx_t ieee80211_subif_start_xmit(s skb = orig_skb; } } |