← 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/nl80211-remove.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/nl80211-remove.patch
 
1
diff -upr linux-2.6.18-gentoo-r6/net/wireless/wext.c linux-2.6.18-gentoo-r6-building/net/wireless/wext.c
 
2
--- linux-2.6.18-gentoo-r6/net/wireless/wext.c  2007-06-04 15:39:37.000000000 -0700
 
3
+++ linux-2.6.18-gentoo-r6-building/net/wireless/wext.c 2007-06-04 15:37:31.000000000 -0700
 
4
@@ -1100,6 +1100,7 @@ int wext_handle_ioctl(struct ifreq *ifr,
 
5
  * Netlink, so there is no possibility of dealock.
 
6
  * Jean II
 
7
  */
 
8
+#if 0
 
9
 
 
10
 static struct sk_buff_head wireless_nlevent_queue;
 
11
 
 
12
@@ -1119,6 +1120,7 @@ static void wireless_nlevent_process(uns
 
13
                netlink_broadcast(rtnl, skb, 0, RTNLGRP_LINK, GFP_ATOMIC);
 
14
 }
 
15
 
 
16
+
 
17
 static DECLARE_TASKLET(wireless_nlevent_tasklet, wireless_nlevent_process, 0);
 
18
 
 
19
 /* ---------------------------------------------------------------- */
 
20
@@ -1182,6 +1184,8 @@ static void rtmsg_iwinfo(struct net_devi
 
21
        tasklet_schedule(&wireless_nlevent_tasklet);
 
22
 }
 
23
 
 
24
+#endif
 
25
+
 
26
 /* ---------------------------------------------------------------- */
 
27
 /*
 
28
  * Main event dispatcher. Called from other parts and drivers.
 
29
@@ -1261,7 +1265,7 @@ void wireless_send_event(struct net_devi
 
30
                memcpy(((char *) event) + hdr_len, extra, extra_len);
 
31
 
 
32
        /* Send via the RtNetlink event channel */
 
33
-       rtmsg_iwinfo(dev, (char *) event, event_len);
 
34
+/*     rtmsg_iwinfo(dev, (char *) event, event_len); */
 
35
 
 
36
        /* Cleanup */
 
37
        kfree(event);