diff options
author | Hauke Mehrtens <hauke@hauke-m.de> | 2014-10-06 22:20:13 +0200 |
---|---|---|
committer | Hauke Mehrtens <hauke@hauke-m.de> | 2014-10-20 23:36:04 +0200 |
commit | 9f4e6ec5c83750458eac89c70274a3f1596283fc (patch) | |
tree | c0f654c9bc0181416cd2e7b45135f1649971b0fa /patches/collateral-evolutions/network/0011-mac80211-disable-tx-status | |
parent | b7a45b19951cc832f24f888f0b82fc26f1e7e80e (diff) |
backports: refresh on next-20140919backports-20140919
1 3.0.101 [ OK ]
2 3.1.10 [ OK ]
3 3.2.62 [ OK ]
4 3.3.8 [ OK ]
5 3.4.103 [ 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.54 [ OK ]
12 3.11.10 [ OK ]
13 3.12.27 [ OK ]
14 3.13.11 [ OK ]
15 3.14.18 [ OK ]
16 3.15.10 [ OK ]
17 3.16.2 [ OK ]
18 3.17-rc3 [ 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 | 6 |
1 files changed, 3 insertions, 3 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 ed792ad0..2afeef40 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 @@ -7,9 +7,9 @@ +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,3,0)) if (unlikely(!multicast && skb->sk && skb_shinfo(skb)->tx_flags & SKBTX_WIFI_STATUS)) { - struct sk_buff *orig_skb = skb; -@@ -2098,6 +2099,7 @@ netdev_tx_t ieee80211_subif_start_xmit(s - skb = orig_skb; + struct sk_buff *ack_skb = skb_clone_sk(skb); +@@ -2091,6 +2092,7 @@ netdev_tx_t ieee80211_subif_start_xmit(s + } } } +#endif |