diff options
author | Johannes Berg | 2011-11-14 10:14:49 -0600 |
---|---|---|
committer | Luis R. Rodriguez | 2011-11-14 14:38:06 -0600 |
commit | 4ab9b629fa91efb8de7856eb3633d5935d34830c (patch) | |
tree | 5a7e538010bf0a81cd501e2b886dda49ea502d51 | |
parent | 06fcbfe20372ea53ec870591b8fe942f5a1b1c8c (diff) | |
download | compat-wireless-4ab9b629fa91efb8de7856eb3633d5935d34830c.tar.gz compat-wireless-4ab9b629fa91efb8de7856eb3633d5935d34830c.tar.xz compat-wireless-4ab9b629fa91efb8de7856eb3633d5935d34830c.zip |
compat-wireless: disable SKB TX status stamping in mac80211
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
-rw-r--r-- | patches/12-mac80211-disable-tx-status.patch | 24 |
1 files changed, 24 insertions, 0 deletions
diff --git a/patches/12-mac80211-disable-tx-status.patch b/patches/12-mac80211-disable-tx-status.patch new file mode 100644 index 0000000..522cb8c --- /dev/null +++ b/patches/12-mac80211-disable-tx-status.patch | |||
@@ -0,0 +1,24 @@ | |||
1 | We can't possibly backport the wifi TX status since | ||
2 | skb_shinfo()->tx_flags used to be a union and there | ||
3 | is no way to make the & work properly in that case. | ||
4 | So we need to just ifdef this part out. | ||
5 | |||
6 | |||
7 | --- a/net/mac80211/tx.c 2011-11-14 16:46:04.000000000 +0100 | ||
8 | +++ b/net/mac80211/tx.c 2011-11-14 17:04:09.000000000 +0100 | ||
9 | @@ -1915,6 +1915,7 @@ netdev_tx_t ieee80211_subif_start_xmit(s | ||
10 | goto fail; | ||
11 | } | ||
12 | |||
13 | +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,3,0)) | ||
14 | if (unlikely(!multicast && skb->sk && | ||
15 | skb_shinfo(skb)->tx_flags & SKBTX_WIFI_STATUS)) { | ||
16 | struct sk_buff *orig_skb = skb; | ||
17 | @@ -1953,6 +1954,7 @@ netdev_tx_t ieee80211_subif_start_xmit(s | ||
18 | skb = orig_skb; | ||
19 | } | ||
20 | } | ||
21 | +#endif | ||
22 | |||
23 | /* | ||
24 | * If the skb is shared we need to obtain our own copy. | ||