← 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/iwlwifi/patches/06-csa.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/iwlwifi/patches/06-csa.patch
 
1
diff -urp old/iwl-helpers.h origin/iwl-helpers.h
 
2
--- old/iwl-helpers.h   2007-10-30 16:05:30.000000000 +0800
 
3
+++ origin/iwl-helpers.h        2007-10-30 16:25:28.000000000 +0800
 
4
@@ -150,6 +150,11 @@ static inline struct ieee80211_conf *iee
 
5
 #define IEEE80211_STYPE_BACK_REQ       0x0080
 
6
 #define IEEE80211_STYPE_BACK           0x0090
 
7
 
 
8
+/* Backward compat added via patches/06-csa.patch */
 
9
+#ifndef IEEE80211_CONF_CHANNEL_SWITCH
 
10
+#define IEEE80211_CONF_CHANNEL_SWITCH (1<<3)
 
11
+#endif
 
12
+
 
13
 
 
14
 static inline int ieee80211_is_management(u16 fc)
 
15
 {