← 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/qdisc-api.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/qdisc-api.patch
 
1
Use older qdisc API for qdisc_create_dflt
 
2
diff -upr pre/net/mac80211/wme.c post/net/mac80211/wme.c
 
3
--- pre/net/mac80211/wme.c      2007-04-17 15:43:47.000000000 -0700
 
4
+++ post/net/mac80211/wme.c     2007-04-17 15:45:55.000000000 -0700
 
5
@@ -445,8 +445,7 @@ static int wme_qdiscop_init(struct Qdisc
 
6
        /* create child queues */
 
7
        for (i = 0; i < queues; i++) {
 
8
                skb_queue_head_init(&q->requeued[i]);
 
9
-               q->queues[i] = qdisc_create_dflt(qd->dev, &pfifo_qdisc_ops,
 
10
-                                                qd->handle);
 
11
+               q->queues[i] = qdisc_create_dflt(qd->dev, &pfifo_qdisc_ops);
 
12
                if (q->queues[i] == 0) {
 
13
                        q->queues[i] = &noop_qdisc;
 
14
                        printk(KERN_ERR "%s child qdisc %i creation failed", dev->name, i);
 
15
@@ -672,7 +671,7 @@ void ieee80211_install_qdisc(struct net_
 
16
 {
 
17
        struct Qdisc *qdisc;
 
18
 
 
19
-       qdisc = qdisc_create_dflt(dev, &wme_qdisc_ops, TC_H_ROOT);
 
20
+       qdisc = qdisc_create_dflt(dev, &wme_qdisc_ops);
 
21
        if (!qdisc) {
 
22
                printk(KERN_ERR "%s: qdisc installation failed\n", dev->name);
 
23
                return;