diff options
author | Hauke Mehrtens <hauke@hauke-m.de> | 2013-10-29 21:06:18 +0100 |
---|---|---|
committer | Hauke Mehrtens <hauke@hauke-m.de> | 2013-10-29 21:55:42 +0100 |
commit | d337aab6cc2b544293e2ab2b369a6236ce0c36b7 (patch) | |
tree | 02f9981b552409bb51753e62d3b1c313e1f57b04 /patches/collateral-evolutions/network/12-mac80211-disable-tx-status/net_mac80211_tx.patch | |
parent | 3d0682d10f44ed81a77066e972111e856e72e916 (diff) |
backports: refresh on 3.12-rc7v3.12-rc7-1
1 2.6.25 [ OK ]
2 2.6.26 [ OK ]
3 2.6.27 [ OK ]
4 2.6.28 [ OK ]
5 2.6.29 [ OK ]
6 2.6.30 [ OK ]
7 2.6.31 [ OK ]
8 2.6.32 [ OK ]
9 2.6.33 [ OK ]
10 2.6.34 [ OK ]
11 2.6.35 [ OK ]
12 2.6.36 [ OK ]
13 2.6.37 [ OK ]
14 2.6.38 [ OK ]
15 2.6.39 [ OK ]
16 3.0.101 [ OK ]
17 3.1.10 [ OK ]
18 3.10.17 [ OK ]
19 3.11.6 [ OK ]
20 3.12-rc7 [ OK ]
21 3.2.52 [ OK ]
22 3.3.8 [ OK ]
23 3.4.67 [ OK ]
24 3.5.7 [ OK ]
25 3.6.11 [ OK ]
26 3.7.10 [ OK ]
27 3.8.13 [ OK ]
28 3.9.11 [ OK ]
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Diffstat (limited to 'patches/collateral-evolutions/network/12-mac80211-disable-tx-status/net_mac80211_tx.patch')
-rw-r--r-- | patches/collateral-evolutions/network/12-mac80211-disable-tx-status/net_mac80211_tx.patch | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/patches/collateral-evolutions/network/12-mac80211-disable-tx-status/net_mac80211_tx.patch b/patches/collateral-evolutions/network/12-mac80211-disable-tx-status/net_mac80211_tx.patch index 3108c1b7..ff957c30 100644 --- a/patches/collateral-evolutions/network/12-mac80211-disable-tx-status/net_mac80211_tx.patch +++ b/patches/collateral-evolutions/network/12-mac80211-disable-tx-status/net_mac80211_tx.patch @@ -1,6 +1,6 @@ --- a/net/mac80211/tx.c +++ b/net/mac80211/tx.c -@@ -1994,6 +1994,7 @@ netdev_tx_t ieee80211_subif_start_xmit(s +@@ -1995,6 +1995,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; -@@ -2022,6 +2023,7 @@ netdev_tx_t ieee80211_subif_start_xmit(s +@@ -2023,6 +2024,7 @@ netdev_tx_t ieee80211_subif_start_xmit(s skb = orig_skb; } } |