Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5ce2d488 authored by David S. Miller's avatar David S. Miller
Browse files

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: default avatarDavid S. Miller <davem@davemloft.net>
parent bb949fbd

include/net/sch_generic.h

+9 −7
Original line number Diff line number Diff line
@@ -38,7 +38,6 @@ struct Qdisc 
	atomic_t		refcnt;

	struct sk_buff_head	q;

	struct netdev_queue	*dev_queue;

	struct net_device	*dev;

	struct list_head	list;



	struct gnet_stats_basic	bstats;
@@ -156,14 +155,18 @@ struct tcf_proto 
	struct tcf_proto_ops	*ops;

};



static inline struct net_device *qdisc_dev(struct Qdisc *qdisc)

{

	return qdisc->dev_queue->dev;

}



extern void qdisc_lock_tree(struct net_device *dev);

extern void qdisc_unlock_tree(struct net_device *dev);



#define sch_tree_lock(q)	qdisc_lock_tree((q)->dev)

#define sch_tree_unlock(q)	qdisc_unlock_tree((q)->dev)

#define tcf_tree_lock(tp)	qdisc_lock_tree((tp)->q->dev)

#define tcf_tree_unlock(tp)	qdisc_unlock_tree((tp)->q->dev)

#define sch_tree_lock(q)	qdisc_lock_tree(qdisc_dev(q))

#define sch_tree_unlock(q)	qdisc_unlock_tree(qdisc_dev(q))

#define tcf_tree_lock(tp)	qdisc_lock_tree(qdisc_dev((tp)->q))

#define tcf_tree_unlock(tp)	qdisc_unlock_tree(qdisc_dev((tp)->q))



extern struct Qdisc noop_qdisc;

extern struct Qdisc_ops noop_qdisc_ops;
@@ -217,8 +220,7 @@ extern void dev_deactivate(struct net_device *dev); 
extern void qdisc_reset(struct Qdisc *qdisc);

extern void qdisc_destroy(struct Qdisc *qdisc);

extern void qdisc_tree_decrease_qlen(struct Qdisc *qdisc, unsigned int n);

extern struct Qdisc *qdisc_alloc(struct net_device *dev,

				 struct netdev_queue *dev_queue,

extern struct Qdisc *qdisc_alloc(struct netdev_queue *dev_queue,

				 struct Qdisc_ops *ops);

extern struct Qdisc *qdisc_create_dflt(struct net_device *dev,

				       struct netdev_queue *dev_queue,

net/mac80211/wme.c

+14 −14
Original line number Diff line number Diff line
@@ -103,7 +103,7 @@ static inline int wme_downgrade_ac(struct sk_buff *skb) 
 * negative return value indicates to drop the frame */

static int classify80211(struct sk_buff *skb, struct Qdisc *qd)

{

	struct ieee80211_local *local = wdev_priv(qd->dev->ieee80211_ptr);

	struct ieee80211_local *local = wdev_priv(qdisc_dev(qd)->ieee80211_ptr);

	struct ieee80211_hdr *hdr = (struct ieee80211_hdr *) skb->data;



	if (!ieee80211_is_data(hdr->frame_control)) {
@@ -140,7 +140,7 @@ static int classify80211(struct sk_buff *skb, struct Qdisc *qd) 


static int wme_qdiscop_enqueue(struct sk_buff *skb, struct Qdisc* qd)

{

	struct ieee80211_local *local = wdev_priv(qd->dev->ieee80211_ptr);

	struct ieee80211_local *local = wdev_priv(qdisc_dev(qd)->ieee80211_ptr);

	struct ieee80211_hw *hw = &local->hw;

	struct ieee80211_sched_data *q = qdisc_priv(qd);

	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) 
static struct sk_buff *wme_qdiscop_dequeue(struct Qdisc* qd)

{

	struct ieee80211_sched_data *q = qdisc_priv(qd);

	struct net_device *dev = qd->dev;

	struct net_device *dev = qdisc_dev(qd);

	struct ieee80211_local *local = wdev_priv(dev->ieee80211_ptr);

	struct ieee80211_hw *hw = &local->hw;

	struct sk_buff *skb;
@@ -286,7 +286,7 @@ static struct sk_buff *wme_qdiscop_dequeue(struct Qdisc* qd) 
static void wme_qdiscop_reset(struct Qdisc* qd)

{

	struct ieee80211_sched_data *q = qdisc_priv(qd);

	struct ieee80211_local *local = wdev_priv(qd->dev->ieee80211_ptr);

	struct ieee80211_local *local = wdev_priv(qdisc_dev(qd)->ieee80211_ptr);

	struct ieee80211_hw *hw = &local->hw;

	int queue;
@@ -303,7 +303,7 @@ static void wme_qdiscop_reset(struct Qdisc* qd) 
static void wme_qdiscop_destroy(struct Qdisc* qd)

{

	struct ieee80211_sched_data *q = qdisc_priv(qd);

	struct ieee80211_local *local = wdev_priv(qd->dev->ieee80211_ptr);

	struct ieee80211_local *local = wdev_priv(qdisc_dev(qd)->ieee80211_ptr);

	struct ieee80211_hw *hw = &local->hw;

	int queue;
@@ -328,7 +328,7 @@ static int wme_qdiscop_tune(struct Qdisc *qd, struct nlattr *opt) 
static int wme_qdiscop_init(struct Qdisc *qd, struct nlattr *opt)

{

	struct ieee80211_sched_data *q = qdisc_priv(qd);

	struct net_device *dev = qd->dev;

	struct net_device *dev = qdisc_dev(qd);

	struct ieee80211_local *local;

	struct ieee80211_hw *hw;

	int err = 0, i;
@@ -359,7 +359,7 @@ static int wme_qdiscop_init(struct Qdisc *qd, struct nlattr *opt) 
	/* create child queues */

	for (i = 0; i < QD_NUM(hw); i++) {

		skb_queue_head_init(&q->requeued[i]);

		q->queues[i] = qdisc_create_dflt(qd->dev, qd->dev_queue,

		q->queues[i] = qdisc_create_dflt(qdisc_dev(qd), qd->dev_queue,

						 &pfifo_qdisc_ops,

						 qd->handle);

		if (!q->queues[i]) {
@@ -386,7 +386,7 @@ static int wme_classop_graft(struct Qdisc *qd, unsigned long arg, 
			     struct Qdisc *new, struct Qdisc **old)

{

	struct ieee80211_sched_data *q = qdisc_priv(qd);

	struct ieee80211_local *local = wdev_priv(qd->dev->ieee80211_ptr);

	struct ieee80211_local *local = wdev_priv(qdisc_dev(qd)->ieee80211_ptr);

	struct ieee80211_hw *hw = &local->hw;

	unsigned long queue = arg - 1;
@@ -410,7 +410,7 @@ static struct Qdisc * 
wme_classop_leaf(struct Qdisc *qd, unsigned long arg)

{

	struct ieee80211_sched_data *q = qdisc_priv(qd);

	struct ieee80211_local *local = wdev_priv(qd->dev->ieee80211_ptr);

	struct ieee80211_local *local = wdev_priv(qdisc_dev(qd)->ieee80211_ptr);

	struct ieee80211_hw *hw = &local->hw;

	unsigned long queue = arg - 1;
@@ -423,7 +423,7 @@ wme_classop_leaf(struct Qdisc *qd, unsigned long arg) 


static unsigned long wme_classop_get(struct Qdisc *qd, u32 classid)

{

	struct ieee80211_local *local = wdev_priv(qd->dev->ieee80211_ptr);

	struct ieee80211_local *local = wdev_priv(qdisc_dev(qd)->ieee80211_ptr);

	struct ieee80211_hw *hw = &local->hw;

	unsigned long queue = TC_H_MIN(classid);
@@ -450,7 +450,7 @@ static int wme_classop_change(struct Qdisc *qd, u32 handle, u32 parent, 
			      struct nlattr **tca, unsigned long *arg)

{

	unsigned long cl = *arg;

	struct ieee80211_local *local = wdev_priv(qd->dev->ieee80211_ptr);

	struct ieee80211_local *local = wdev_priv(qdisc_dev(qd)->ieee80211_ptr);

	struct ieee80211_hw *hw = &local->hw;



	if (cl - 1 > QD_NUM(hw))
@@ -467,7 +467,7 @@ static int wme_classop_change(struct Qdisc *qd, u32 handle, u32 parent, 
 * when we add WMM-SA support - TSPECs may be deleted here */

static int wme_classop_delete(struct Qdisc *qd, unsigned long cl)

{

	struct ieee80211_local *local = wdev_priv(qd->dev->ieee80211_ptr);

	struct ieee80211_local *local = wdev_priv(qdisc_dev(qd)->ieee80211_ptr);

	struct ieee80211_hw *hw = &local->hw;



	if (cl - 1 > QD_NUM(hw))
@@ -480,7 +480,7 @@ static int wme_classop_dump_class(struct Qdisc *qd, unsigned long cl, 
				  struct sk_buff *skb, struct tcmsg *tcm)

{

	struct ieee80211_sched_data *q = qdisc_priv(qd);

	struct ieee80211_local *local = wdev_priv(qd->dev->ieee80211_ptr);

	struct ieee80211_local *local = wdev_priv(qdisc_dev(qd)->ieee80211_ptr);

	struct ieee80211_hw *hw = &local->hw;



	if (cl - 1 > QD_NUM(hw))
@@ -494,7 +494,7 @@ static int wme_classop_dump_class(struct Qdisc *qd, unsigned long cl, 


static void wme_classop_walk(struct Qdisc *qd, struct qdisc_walker *arg)

{

	struct ieee80211_local *local = wdev_priv(qd->dev->ieee80211_ptr);

	struct ieee80211_local *local = wdev_priv(qdisc_dev(qd)->ieee80211_ptr);

	struct ieee80211_hw *hw = &local->hw;

	int queue;

net/sched/cls_api.c

+1 −1
Original line number Diff line number Diff line
@@ -334,7 +334,7 @@ static int tcf_fill_node(struct sk_buff *skb, struct tcf_proto *tp, 
	tcm->tcm_family = AF_UNSPEC;

	tcm->tcm__pad1 = 0;

	tcm->tcm__pad1 = 0;

	tcm->tcm_ifindex = tp->q->dev->ifindex;

	tcm->tcm_ifindex = qdisc_dev(tp->q)->ifindex;

	tcm->tcm_parent = tp->classid;

	tcm->tcm_info = TC_H_MAKE(tp->prio, tp->protocol);

	NLA_PUT_STRING(skb, TCA_KIND, tp->ops->kind);

net/sched/cls_route.c

+2 −2
Original line number Diff line number Diff line
@@ -302,7 +302,7 @@ static int route4_delete(struct tcf_proto *tp, unsigned long arg) 
			*fp = f->next;

			tcf_tree_unlock(tp);



			route4_reset_fastmap(tp->q->dev, head, f->id);

			route4_reset_fastmap(qdisc_dev(tp->q), head, f->id);

			route4_delete_filter(tp, f);



			/* Strip tree */
@@ -500,7 +500,7 @@ reinsert: 
	}

	tcf_tree_unlock(tp);



	route4_reset_fastmap(tp->q->dev, head, f->id);

	route4_reset_fastmap(qdisc_dev(tp->q), head, f->id);

	*arg = (unsigned long)f;

	return 0;

net/sched/sch_api.c

+5 −5
Original line number Diff line number Diff line
@@ -281,7 +281,7 @@ static enum hrtimer_restart qdisc_watchdog(struct hrtimer *timer) 
{

	struct qdisc_watchdog *wd = container_of(timer, struct qdisc_watchdog,

						 timer);

	struct net_device *dev = wd->qdisc->dev;

	struct net_device *dev = qdisc_dev(wd->qdisc);



	wd->qdisc->flags &= ~TCQ_F_THROTTLED;

	smp_wmb();
@@ -493,7 +493,7 @@ void qdisc_tree_decrease_qlen(struct Qdisc *sch, unsigned int n) 
		if (TC_H_MAJ(parentid) == TC_H_MAJ(TC_H_INGRESS))

			return;



		sch = qdisc_lookup(sch->dev, TC_H_MAJ(parentid));

		sch = qdisc_lookup(qdisc_dev(sch), TC_H_MAJ(parentid));

		if (sch == NULL) {

			WARN_ON(parentid != TC_H_ROOT);

			return;
@@ -593,7 +593,7 @@ qdisc_create(struct net_device *dev, struct netdev_queue *dev_queue, 
	if (ops == NULL)

		goto err_out;



	sch = qdisc_alloc(dev, dev_queue, ops);

	sch = qdisc_alloc(dev_queue, ops);

	if (IS_ERR(sch)) {

		err = PTR_ERR(sch);

		goto err_out2;
@@ -940,7 +940,7 @@ static int tc_fill_qdisc(struct sk_buff *skb, struct Qdisc *q, u32 clid, 
	tcm->tcm_family = AF_UNSPEC;

	tcm->tcm__pad1 = 0;

	tcm->tcm__pad2 = 0;

	tcm->tcm_ifindex = q->dev->ifindex;

	tcm->tcm_ifindex = qdisc_dev(q)->ifindex;

	tcm->tcm_parent = clid;

	tcm->tcm_handle = q->handle;

	tcm->tcm_info = atomic_read(&q->refcnt);
@@ -1186,7 +1186,7 @@ static int tc_fill_tclass(struct sk_buff *skb, struct Qdisc *q, 
	nlh = NLMSG_NEW(skb, pid, seq, event, sizeof(*tcm), flags);

	tcm = NLMSG_DATA(nlh);

	tcm->tcm_family = AF_UNSPEC;

	tcm->tcm_ifindex = q->dev->ifindex;

	tcm->tcm_ifindex = qdisc_dev(q)->ifindex;

	tcm->tcm_parent = q->handle;

	tcm->tcm_handle = q->handle;

	tcm->tcm_info = 0;