diff options
| author | David S. Miller <davem@davemloft.net> | 2008-07-06 02:08:07 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-07-06 02:08:07 -0400 |
| commit | ea2aca084ba82aaf7c148d04914ceed8758ce08a (patch) | |
| tree | dcb3f4f849cf48deac2dd3bafd5c2cd2f0e7dc79 /net/mac80211/wme.c | |
| parent | f3032be921cd126615ce3bfd7084e3d319f3f892 (diff) | |
| parent | c5a78ac00c400df29645e59938700301efb371d0 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
Documentation/feature-removal-schedule.txt
drivers/net/wan/hdlc_fr.c
drivers/net/wireless/iwlwifi/iwl-4965.c
drivers/net/wireless/iwlwifi/iwl3945-base.c
Diffstat (limited to 'net/mac80211/wme.c')
| -rw-r--r-- | net/mac80211/wme.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/net/mac80211/wme.c b/net/mac80211/wme.c index f23b5a4d4ac9..ffe1af82fa4d 100644 --- a/net/mac80211/wme.c +++ b/net/mac80211/wme.c | |||
| @@ -308,8 +308,7 @@ static void wme_qdiscop_destroy(struct Qdisc* qd) | |||
| 308 | struct ieee80211_hw *hw = &local->hw; | 308 | struct ieee80211_hw *hw = &local->hw; |
| 309 | int queue; | 309 | int queue; |
| 310 | 310 | ||
| 311 | tcf_destroy_chain(q->filter_list); | 311 | tcf_destroy_chain(&q->filter_list); |
| 312 | q->filter_list = NULL; | ||
| 313 | 312 | ||
| 314 | for (queue = 0; queue < QD_NUM(hw); queue++) { | 313 | for (queue = 0; queue < QD_NUM(hw); queue++) { |
| 315 | skb_queue_purge(&q->requeued[queue]); | 314 | skb_queue_purge(&q->requeued[queue]); |