summaryrefslogtreecommitdiff
path: root/patches/collateral-evolutions/network/12-mac80211-disable-tx-status/net_mac80211_tx.patch
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2014-01-19 19:32:28 +0100
committerHauke Mehrtens <hauke@hauke-m.de>2014-01-19 21:55:32 +0100
commitae71bd3d289a08b47100e94830e87090aaf3ce4d (patch)
tree590da4197c40e40acc3f65df30061309572c52b9 /patches/collateral-evolutions/network/12-mac80211-disable-tx-status/net_mac80211_tx.patch
parent6d5a504cf10bea71e9bf094b4675b6443fe9e859 (diff)
backports: refresh on v3.13-rc8v3.13-rc8-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.2.54 [ OK ] 19 3.3.8 [ OK ] 20 3.4.77 [ OK ] 21 3.5.7 [ OK ] 22 3.6.11 [ OK ] 23 3.7.10 [ OK ] 24 3.8.13 [ OK ] 25 3.9.11 [ OK ] 26 3.10.27 [ OK ] 27 3.11.10 [ OK ] 28 3.12.8 [ OK ] 29 3.13-rc8 [ 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.patch4
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 2dbe9455..5ddec167 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
-@@ -2024,6 +2024,7 @@ netdev_tx_t ieee80211_subif_start_xmit(s
+@@ -2027,6 +2027,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;
-@@ -2052,6 +2053,7 @@ netdev_tx_t ieee80211_subif_start_xmit(s
+@@ -2055,6 +2056,7 @@ netdev_tx_t ieee80211_subif_start_xmit(s
skb = orig_skb;
}
}