From e14c175f8763f44fed18c95fb1e515945c2c5f43 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ozan=20=C3=87a=C4=9Flayan?= Date: Tue, 21 Aug 2012 19:34:54 +0300 Subject: compat-drivers: Move around patches and selectively apply them MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Put wlan/bt/eth related patches under network/ subdirectories. Apply them only if the network subsystem is enabled (For now, it is enabled by default). Create empty network/ placeholders under patch directories. Signed-off-by: Ozan Çağlayan Signed-off-by: Luis R. Rodriguez --- patches/12-mac80211-disable-tx-status.patch | 24 ------------------------ 1 file changed, 24 deletions(-) delete mode 100644 patches/12-mac80211-disable-tx-status.patch (limited to 'patches/12-mac80211-disable-tx-status.patch') diff --git a/patches/12-mac80211-disable-tx-status.patch b/patches/12-mac80211-disable-tx-status.patch deleted file mode 100644 index 2c43013f..00000000 --- a/patches/12-mac80211-disable-tx-status.patch +++ /dev/null @@ -1,24 +0,0 @@ -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 -@@ -1966,6 +1966,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; -@@ -2004,6 +2005,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. -- cgit v1.2.3