diff options
| author | Hauke Mehrtens <hauke@hauke-m.de> | 2014-09-07 12:56:05 +0200 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2014-10-25 16:20:25 +0200 |
| commit | 7793930ad12f67c15bab95fa3cea34345472722f (patch) | |
| tree | 473259b8f63713fced5b92f0306df03ac38e96da /patches/collateral-evolutions/network/12-mac80211-disable-tx-status/net_mac80211_tx.patch | |
| parent | 36f33cbcb7b2652850f76a7413adf17f12fdf5e8 (diff) | |
backports: refresh on v3.14.22v3.14.22-1linux-3.14.y
1 3.0.101 [ OK ]
2 3.1.10 [ OK ]
3 3.2.62 [ OK ]
4 3.3.8 [ OK ]
5 3.4.104 [ 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.58 [ OK ]
12 3.11.10 [ OK ]
13 3.12.31 [ OK ]
14 3.13.11 [ OK ]
15 3.14.22 [ 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 c63467a0..34dca227 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 -@@ -2069,6 +2069,7 @@ netdev_tx_t ieee80211_subif_start_xmit(s +@@ -2068,6 +2068,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; -@@ -2097,6 +2098,7 @@ netdev_tx_t ieee80211_subif_start_xmit(s +@@ -2096,6 +2097,7 @@ netdev_tx_t ieee80211_subif_start_xmit(s skb = orig_skb; } } |