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>2013-11-13 17:10:58 +0100
committerHauke Mehrtens <hauke@hauke-m.de>2013-11-13 17:11:25 +0100
commitb22d1cda84990acd6f724a7dc8236546688908c8 (patch)
treedb92a4eb6ab87a49d2f4a4b6e26acfbda8fbfe74 /patches/collateral-evolutions/network/12-mac80211-disable-tx-status/net_mac80211_tx.patch
parent26017fee66587a8210302ff54868bfa67d6e5feb (diff)
backports: refresh patches on v3.11.8v3.11.8-1
== ckmake-report.log == 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 [ FAIL ] 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.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 e8339e7e..c638cd51 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
-@@ -1972,6 +1972,7 @@ netdev_tx_t ieee80211_subif_start_xmit(s
+@@ -1973,6 +1973,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;
-@@ -2000,6 +2001,7 @@ netdev_tx_t ieee80211_subif_start_xmit(s
+@@ -2001,6 +2002,7 @@ netdev_tx_t ieee80211_subif_start_xmit(s
skb = orig_skb;
}
}