← Back to branch summary

~ubuntu-branches/ubuntu/natty/linux-backports-modules-2.6.38/natty-proposed

« back to all changes in this revision

Viewing changes to updates/compat-wireless-2.6.36/patches/15-symbol-export-conflicts.patch

  • Committer: Bazaar Package Importer
  • Author(s): Tim Gardner, Tim Gardner
  • Date: 2011-06-08 10:44:09 UTC
  • Revision ID: james.westby@ubuntu.com-20110608104409-fnl8carkdo15bwsz
Tags: 2.6.38-10.6
[ Tim Gardner ]

Shorten compat-wireless package name to cw to accomodate
CDROM file name length restrictions.

Show diffs side-by-side

added added

removed removed

Lines of Context:
updates/compat-wireless-2.6.36/patches/15-symbol-export-conflicts.patch
1
 
In kernel < 2.6.32 libipw also exports ieee80211_rx.
2
 
To avoid conflicts with the other export we rename our.
3
 
 
4
 
--- a/net/mac80211/rx.c
5
 
+++ b/net/mac80211/rx.c
6
 
@@ -2662,7 +2662,12 @@ void ieee80211_rx(struct ieee80211_hw *h
7
 
  drop:
8
 
        kfree_skb(skb);
9
 
 }
10
 
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,32))
11
 
 EXPORT_SYMBOL(ieee80211_rx);
12
 
+#else
13
 
+EXPORT_SYMBOL(mac80211_ieee80211_rx);
14
 
+#endif
15
 
+
16
 
 
17
 
 /* This is a version of the rx handler that can be called from hard irq
18
 
  * context. Post the skb on the queue and schedule the tasklet */