← Back to branch summary

~ubuntu-branches/ubuntu/hardy/linux-backports-modules-2.6.24/hardy-security

« back to all changes in this revision

Viewing changes to updates/wireless/iwlwifi/mac80211/patches/ieee80211_ptr.patch

  • Committer: Bazaar Package Importer
  • Author(s): , Ben Collins
  • Date: 2008-04-02 06:59:04 UTC
  • Revision ID: james.westby@ubuntu.com-20080402065904-e5knh2gn2hms3xbb
Tags: 2.6.24-14.11
https://launchpad.net/bugs/200950
https://launchpad.net/bugs/176090
[Ben Collins]

* iwlwifi: Update to iwlwifi-1.2.25 and mac80211-10.0.4
  - LP: #200950
* ubuntu: Slight cleanups to module hiearchy and Makefiles
* mac80211: Enable LED triggers
* iwlwifi: Add LED trigger support (rx and tx only)
  - LP: #176090

Show diffs side-by-side

added added

removed removed

Lines of Context:
updates/wireless/iwlwifi/mac80211/patches/ieee80211_ptr.patch
 
1
Re-use ax25_ptr in net_device for ieee80211_ptr
 
2
 
 
3
Signed-off-by: James Ketrenos <jketreno@linux.intel.com>
 
4
diff -Nupr orig/net/mac80211/ieee80211_i.h tip/net/mac80211/ieee80211_i.h
 
5
--- orig/net/mac80211/ieee80211_i.h     2007-01-29 14:27:55.000000000 -0800
 
6
+++ tip/net/mac80211/ieee80211_i.h      2007-01-29 14:29:24.000000000 -0800
 
7
@@ -26,6 +26,8 @@
 
8
 /* ieee80211.o internal definitions, etc. These are not included into
 
9
  * low-level drivers. */
 
10
 
 
11
+#define ieee80211_ptr ax25_ptr
 
12
+
 
13
 #ifndef ETH_P_PAE
 
14
 #define ETH_P_PAE 0x888E /* Port Access Entity (IEEE 802.1X) */
 
15
 #endif /* ETH_P_PAE */
 
16
diff -upr origin/net/wireless/core.c update/net/wireless/core.c
 
17
--- origin/net/wireless/core.c  2007-06-01 13:44:01.000000000 -0700
 
18
+++ update/net/wireless/core.c  2007-06-01 13:48:43.000000000 -0700
 
19
@@ -20,6 +20,10 @@
 
20
 #include "core.h"
 
21
 #include "sysfs.h"
 
22
 
 
23
+#ifndef ieee80211_ptr
 
24
+#define ieee80211_ptr ax25_ptr
 
25
+#endif
 
26
+
 
27
 /* name for sysfs, %d is appended */
 
28
 #define PHY_NAME "phy"
 
29
 
 
30
Only in update/net/wireless: wext-mod.c