aboutsummaryrefslogtreecommitdiffstats
path: root/net/mac80211
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2008-07-08 20:06:30 -0400
committerDavid S. Miller <davem@davemloft.net>2008-07-08 20:06:30 -0400
commit5ce2d488fe039ddd86a638496cf704df86c74eeb (patch)
tree71b4d982bfa8bd457bb41c0693c0e70d75b524b4 /net/mac80211
parentbb949fbd1878973c3539d9aecff52f284482a937 (diff)
pkt_sched: Remove 'dev' member of struct Qdisc.
It can be obtained via the netdev_queue. So create a helper routine, qdisc_dev(), to make the transformations nicer looking. Now, qdisc_alloc() now no longer needs a net_device pointer argument. Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/mac80211')
-rw-r--r--net/mac80211/wme.c28
1 files changed, 14 insertions, 14 deletions
diff --git a/net/mac80211/wme.c b/net/mac80211/wme.c
index 770f1c09b79..2fbc171130b 100644
--- a/net/mac80211/wme.c
+++ b/net/mac80211/wme.c
@@ -103,7 +103,7 @@ static inline int wme_downgrade_ac(struct sk_buff *skb)
103 * negative return value indicates to drop the frame */ 103 * negative return value indicates to drop the frame */
104static int classify80211(struct sk_buff *skb, struct Qdisc *qd) 104static int classify80211(struct sk_buff *skb, struct Qdisc *qd)
105{ 105{
106 struct ieee80211_local *local = wdev_priv(qd->dev->ieee80211_ptr); 106 struct ieee80211_local *local = wdev_priv(qdisc_dev(qd)->ieee80211_ptr);
107 struct ieee80211_hdr *hdr = (struct ieee80211_hdr *) skb->data; 107 struct ieee80211_hdr *hdr = (struct ieee80211_hdr *) skb->data;
108 108
109 if (!ieee80211_is_data(hdr->frame_control)) { 109 if (!ieee80211_is_data(hdr->frame_control)) {
@@ -140,7 +140,7 @@ static int classify80211(struct sk_buff *skb, struct Qdisc *qd)
140 140
141static int wme_qdiscop_enqueue(struct sk_buff *skb, struct Qdisc* qd) 141static int wme_qdiscop_enqueue(struct sk_buff *skb, struct Qdisc* qd)
142{ 142{
143 struct ieee80211_local *local = wdev_priv(qd->dev->ieee80211_ptr); 143 struct ieee80211_local *local = wdev_priv(qdisc_dev(qd)->ieee80211_ptr);
144 struct ieee80211_hw *hw = &local->hw; 144 struct ieee80211_hw *hw = &local->hw;
145 struct ieee80211_sched_data *q = qdisc_priv(qd); 145 struct ieee80211_sched_data *q = qdisc_priv(qd);
146 struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb); 146 struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb);
@@ -249,7 +249,7 @@ static int wme_qdiscop_requeue(struct sk_buff *skb, struct Qdisc* qd)
249static struct sk_buff *wme_qdiscop_dequeue(struct Qdisc* qd) 249static struct sk_buff *wme_qdiscop_dequeue(struct Qdisc* qd)
250{ 250{
251 struct ieee80211_sched_data *q = qdisc_priv(qd); 251 struct ieee80211_sched_data *q = qdisc_priv(qd);
252 struct net_device *dev = qd->dev; 252 struct net_device *dev = qdisc_dev(qd);
253 struct ieee80211_local *local = wdev_priv(dev->ieee80211_ptr); 253 struct ieee80211_local *local = wdev_priv(dev->ieee80211_ptr);
254 struct ieee80211_hw *hw = &local->hw; 254 struct ieee80211_hw *hw = &local->hw;
255 struct sk_buff *skb; 255 struct sk_buff *skb;
@@ -286,7 +286,7 @@ static struct sk_buff *wme_qdiscop_dequeue(struct Qdisc* qd)
286static void wme_qdiscop_reset(struct Qdisc* qd) 286static void wme_qdiscop_reset(struct Qdisc* qd)
287{ 287{
288 struct ieee80211_sched_data *q = qdisc_priv(qd); 288 struct ieee80211_sched_data *q = qdisc_priv(qd);
289 struct ieee80211_local *local = wdev_priv(qd->dev->ieee80211_ptr); 289 struct ieee80211_local *local = wdev_priv(qdisc_dev(qd)->ieee80211_ptr);
290 struct ieee80211_hw *hw = &local->hw; 290 struct ieee80211_hw *hw = &local->hw;
291 int queue; 291 int queue;
292 292
@@ -303,7 +303,7 @@ static void wme_qdiscop_reset(struct Qdisc* qd)
303static void wme_qdiscop_destroy(struct Qdisc* qd) 303static void wme_qdiscop_destroy(struct Qdisc* qd)
304{ 304{
305 struct ieee80211_sched_data *q = qdisc_priv(qd); 305 struct ieee80211_sched_data *q = qdisc_priv(qd);
306 struct ieee80211_local *local = wdev_priv(qd->dev->ieee80211_ptr); 306 struct ieee80211_local *local = wdev_priv(qdisc_dev(qd)->ieee80211_ptr);
307 struct ieee80211_hw *hw = &local->hw; 307 struct ieee80211_hw *hw = &local->hw;
308 int queue; 308 int queue;
309 309
@@ -328,7 +328,7 @@ static int wme_qdiscop_tune(struct Qdisc *qd, struct nlattr *opt)
328static int wme_qdiscop_init(struct Qdisc *qd, struct nlattr *opt) 328static int wme_qdiscop_init(struct Qdisc *qd, struct nlattr *opt)
329{ 329{
330 struct ieee80211_sched_data *q = qdisc_priv(qd); 330 struct ieee80211_sched_data *q = qdisc_priv(qd);
331 struct net_device *dev = qd->dev; 331 struct net_device *dev = qdisc_dev(qd);
332 struct ieee80211_local *local; 332 struct ieee80211_local *local;
333 struct ieee80211_hw *hw; 333 struct ieee80211_hw *hw;
334 int err = 0, i; 334 int err = 0, i;
@@ -359,7 +359,7 @@ static int wme_qdiscop_init(struct Qdisc *qd, struct nlattr *opt)
359 /* create child queues */ 359 /* create child queues */
360 for (i = 0; i < QD_NUM(hw); i++) { 360 for (i = 0; i < QD_NUM(hw); i++) {
361 skb_queue_head_init(&q->requeued[i]); 361 skb_queue_head_init(&q->requeued[i]);
362 q->queues[i] = qdisc_create_dflt(qd->dev, qd->dev_queue, 362 q->queues[i] = qdisc_create_dflt(qdisc_dev(qd), qd->dev_queue,
363 &pfifo_qdisc_ops, 363 &pfifo_qdisc_ops,
364 qd->handle); 364 qd->handle);
365 if (!q->queues[i]) { 365 if (!q->queues[i]) {
@@ -386,7 +386,7 @@ static int wme_classop_graft(struct Qdisc *qd, unsigned long arg,
386 struct Qdisc *new, struct Qdisc **old) 386 struct Qdisc *new, struct Qdisc **old)
387{ 387{
388 struct ieee80211_sched_data *q = qdisc_priv(qd); 388 struct ieee80211_sched_data *q = qdisc_priv(qd);
389 struct ieee80211_local *local = wdev_priv(qd->dev->ieee80211_ptr); 389 struct ieee80211_local *local = wdev_priv(qdisc_dev(qd)->ieee80211_ptr);
390 struct ieee80211_hw *hw = &local->hw; 390 struct ieee80211_hw *hw = &local->hw;
391 unsigned long queue = arg - 1; 391 unsigned long queue = arg - 1;
392 392
@@ -410,7 +410,7 @@ static struct Qdisc *
410wme_classop_leaf(struct Qdisc *qd, unsigned long arg) 410wme_classop_leaf(struct Qdisc *qd, unsigned long arg)
411{ 411{
412 struct ieee80211_sched_data *q = qdisc_priv(qd); 412 struct ieee80211_sched_data *q = qdisc_priv(qd);
413 struct ieee80211_local *local = wdev_priv(qd->dev->ieee80211_ptr); 413 struct ieee80211_local *local = wdev_priv(qdisc_dev(qd)->ieee80211_ptr);
414 struct ieee80211_hw *hw = &local->hw; 414 struct ieee80211_hw *hw = &local->hw;
415 unsigned long queue = arg - 1; 415 unsigned long queue = arg - 1;
416 416
@@ -423,7 +423,7 @@ wme_classop_leaf(struct Qdisc *qd, unsigned long arg)
423 423
424static unsigned long wme_classop_get(struct Qdisc *qd, u32 classid) 424static unsigned long wme_classop_get(struct Qdisc *qd, u32 classid)
425{ 425{
426 struct ieee80211_local *local = wdev_priv(qd->dev->ieee80211_ptr); 426 struct ieee80211_local *local = wdev_priv(qdisc_dev(qd)->ieee80211_ptr);
427 struct ieee80211_hw *hw = &local->hw; 427 struct ieee80211_hw *hw = &local->hw;
428 unsigned long queue = TC_H_MIN(classid); 428 unsigned long queue = TC_H_MIN(classid);
429 429
@@ -450,7 +450,7 @@ static int wme_classop_change(struct Qdisc *qd, u32 handle, u32 parent,
450 struct nlattr **tca, unsigned long *arg) 450 struct nlattr **tca, unsigned long *arg)
451{ 451{
452 unsigned long cl = *arg; 452 unsigned long cl = *arg;
453 struct ieee80211_local *local = wdev_priv(qd->dev->ieee80211_ptr); 453 struct ieee80211_local *local = wdev_priv(qdisc_dev(qd)->ieee80211_ptr);
454 struct ieee80211_hw *hw = &local->hw; 454 struct ieee80211_hw *hw = &local->hw;
455 455
456 if (cl - 1 > QD_NUM(hw)) 456 if (cl - 1 > QD_NUM(hw))
@@ -467,7 +467,7 @@ static int wme_classop_change(struct Qdisc *qd, u32 handle, u32 parent,
467 * when we add WMM-SA support - TSPECs may be deleted here */ 467 * when we add WMM-SA support - TSPECs may be deleted here */
468static int wme_classop_delete(struct Qdisc *qd, unsigned long cl) 468static int wme_classop_delete(struct Qdisc *qd, unsigned long cl)
469{ 469{
470 struct ieee80211_local *local = wdev_priv(qd->dev->ieee80211_ptr); 470 struct ieee80211_local *local = wdev_priv(qdisc_dev(qd)->ieee80211_ptr);
471 struct ieee80211_hw *hw = &local->hw; 471 struct ieee80211_hw *hw = &local->hw;
472 472
473 if (cl - 1 > QD_NUM(hw)) 473 if (cl - 1 > QD_NUM(hw))
@@ -480,7 +480,7 @@ static int wme_classop_dump_class(struct Qdisc *qd, unsigned long cl,
480 struct sk_buff *skb, struct tcmsg *tcm) 480 struct sk_buff *skb, struct tcmsg *tcm)
481{ 481{
482 struct ieee80211_sched_data *q = qdisc_priv(qd); 482 struct ieee80211_sched_data *q = qdisc_priv(qd);
483 struct ieee80211_local *local = wdev_priv(qd->dev->ieee80211_ptr); 483 struct ieee80211_local *local = wdev_priv(qdisc_dev(qd)->ieee80211_ptr);
484 struct ieee80211_hw *hw = &local->hw; 484 struct ieee80211_hw *hw = &local->hw;
485 485
486 if (cl - 1 > QD_NUM(hw)) 486 if (cl - 1 > QD_NUM(hw))
@@ -494,7 +494,7 @@ static int wme_classop_dump_class(struct Qdisc *qd, unsigned long cl,
494 494
495static void wme_classop_walk(struct Qdisc *qd, struct qdisc_walker *arg) 495static void wme_classop_walk(struct Qdisc *qd, struct qdisc_walker *arg)
496{ 496{
497 struct ieee80211_local *local = wdev_priv(qd->dev->ieee80211_ptr); 497 struct ieee80211_local *local = wdev_priv(qdisc_dev(qd)->ieee80211_ptr);
498 struct ieee80211_hw *hw = &local->hw; 498 struct ieee80211_hw *hw = &local->hw;
499 int queue; 499 int queue;
500 500