25 lines
678 B
Diff
25 lines
678 B
Diff
|
We can't possibly backport the wifi TX status since
|
||
|
|
skb_shinfo()->tx_flags used to be a union and there
|
||
|
|
is no way to make the & work properly in that case.
|
||
|
|
So we need to just ifdef this part out.
|
||
|
|
|
||
|
|
|
||
|
|
--- a/net/mac80211/tx.c
|
||
|
|
+++ b/net/mac80211/tx.c
|
||
|
|
@@ -1915,6 +1915,7 @@ netdev_tx_t ieee80211_subif_start_xmit(s
|
||
|
|
goto fail;
|
||
|
|
}
|
||
|
|
|
||
|
|
+#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;
|
||
|
|
@@ -1953,6 +1954,7 @@ netdev_tx_t ieee80211_subif_start_xmit(s
|
||
|
|
skb = orig_skb;
|
||
|
|
}
|
||
|
|
}
|
||
|
|
+#endif
|
||
|
|
|
||
|
|
/*
|
||
|
|
* If the skb is shared we need to obtain our own copy.
|