diff options
author | Johannes Berg <johannes.berg@intel.com> | 2013-04-12 13:44:03 +0200 |
---|---|---|
committer | Johannes Berg <johannes.berg@intel.com> | 2013-04-15 11:32:47 +0200 |
commit | 78b1e9068b4013903c69f1cb3432c08dbd72459e (patch) | |
tree | 7840b0cdfbffc575935740c7bd4c31e994939ede /patches | |
parent | 6b0d9bf36191b5121eec77955739fa97610ed554 (diff) |
backports: dissolve compat-2.6.32.h
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'patches')
-rw-r--r-- | patches/collateral-evolutions/network/15-symbol-export-conflicts/INFO | 3 | ||||
-rw-r--r-- | patches/collateral-evolutions/network/15-symbol-export-conflicts/net_mac80211_rx.patch | 15 |
2 files changed, 0 insertions, 18 deletions
diff --git a/patches/collateral-evolutions/network/15-symbol-export-conflicts/INFO b/patches/collateral-evolutions/network/15-symbol-export-conflicts/INFO deleted file mode 100644 index 40356155..00000000 --- a/patches/collateral-evolutions/network/15-symbol-export-conflicts/INFO +++ /dev/null @@ -1,3 +0,0 @@ -In kernel < 2.6.32 libipw also exports ieee80211_rx. -To avoid conflicts with the other export we rename our. - diff --git a/patches/collateral-evolutions/network/15-symbol-export-conflicts/net_mac80211_rx.patch b/patches/collateral-evolutions/network/15-symbol-export-conflicts/net_mac80211_rx.patch deleted file mode 100644 index e8f890d2..00000000 --- a/patches/collateral-evolutions/network/15-symbol-export-conflicts/net_mac80211_rx.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- a/net/mac80211/rx.c -+++ b/net/mac80211/rx.c -@@ -3317,7 +3317,12 @@ void ieee80211_rx(struct ieee80211_hw *h - drop: - kfree_skb(skb); - } -+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,32)) - EXPORT_SYMBOL(ieee80211_rx); -+#else -+EXPORT_SYMBOL(mac80211_ieee80211_rx); -+#endif -+ - - /* This is a version of the rx handler that can be called from hard irq - * context. Post the skb on the queue and schedule the tasklet */ |