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

Commit 3511c913 authored by Changli Gao's avatar Changli Gao Committed by David S. Miller
Browse files

net_sched: remove the unused parameter of qdisc_create_dflt() 



The first parameter dev isn't in use in qdisc_create_dflt().

Signed-off-by: default avatarChangli Gao <xiaosuo@gmail.com>
Acked-by: default avatarJamal Hadi Salim <hadi@cyberus.ca>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 26d8ee75

include/net/sch_generic.h

+1 −2
Original line number Diff line number Diff line
@@ -328,8 +328,7 @@ 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 netdev_queue *dev_queue,

				 struct Qdisc_ops *ops);

extern struct Qdisc *qdisc_create_dflt(struct net_device *dev,

				       struct netdev_queue *dev_queue,

extern struct Qdisc *qdisc_create_dflt(struct netdev_queue *dev_queue,

				       struct Qdisc_ops *ops, u32 parentid);

extern void qdisc_calculate_pkt_len(struct sk_buff *skb,

				   struct qdisc_size_table *stab);

net/sched/sch_atm.c

+2 −3
Original line number Diff line number Diff line
@@ -275,8 +275,7 @@ static int atm_tc_change(struct Qdisc *sch, u32 classid, u32 parent, 
		goto err_out;

	}

	flow->filter_list = NULL;

	flow->q = qdisc_create_dflt(qdisc_dev(sch), sch->dev_queue,

				    &pfifo_qdisc_ops, classid);

	flow->q = qdisc_create_dflt(sch->dev_queue, &pfifo_qdisc_ops, classid);

	if (!flow->q)

		flow->q = &noop_qdisc;

	pr_debug("atm_tc_change: qdisc %p\n", flow->q);
@@ -543,7 +542,7 @@ static int atm_tc_init(struct Qdisc *sch, struct nlattr *opt) 
	INIT_LIST_HEAD(&p->flows);

	INIT_LIST_HEAD(&p->link.list);

	list_add(&p->link.list, &p->flows);

	p->link.q = qdisc_create_dflt(qdisc_dev(sch), sch->dev_queue,

	p->link.q = qdisc_create_dflt(sch->dev_queue,

				      &pfifo_qdisc_ops, sch->handle);

	if (!p->link.q)

		p->link.q = &noop_qdisc;

net/sched/sch_cbq.c

+6 −6
Original line number Diff line number Diff line
@@ -1379,9 +1379,9 @@ static int cbq_init(struct Qdisc *sch, struct nlattr *opt) 
	q->link.sibling = &q->link;

	q->link.common.classid = sch->handle;

	q->link.qdisc = sch;

	if (!(q->link.q = qdisc_create_dflt(qdisc_dev(sch), sch->dev_queue,

					    &pfifo_qdisc_ops,

					    sch->handle)))

	q->link.q = qdisc_create_dflt(sch->dev_queue, &pfifo_qdisc_ops,

				      sch->handle);

	if (!q->link.q)

		q->link.q = &noop_qdisc;



	q->link.priority = TC_CBQ_MAXPRIO-1;
@@ -1623,7 +1623,7 @@ static int cbq_graft(struct Qdisc *sch, unsigned long arg, struct Qdisc *new, 
	struct cbq_class *cl = (struct cbq_class*)arg;



	if (new == NULL) {

		new = qdisc_create_dflt(qdisc_dev(sch), sch->dev_queue,

		new = qdisc_create_dflt(sch->dev_queue,

					&pfifo_qdisc_ops, cl->common.classid);

		if (new == NULL)

			return -ENOBUFS;
@@ -1874,8 +1874,8 @@ cbq_change_class(struct Qdisc *sch, u32 classid, u32 parentid, struct nlattr **t 
	cl->R_tab = rtab;

	rtab = NULL;

	cl->refcnt = 1;

	if (!(cl->q = qdisc_create_dflt(qdisc_dev(sch), sch->dev_queue,

					&pfifo_qdisc_ops, classid)))

	cl->q = qdisc_create_dflt(sch->dev_queue, &pfifo_qdisc_ops, classid);

	if (!cl->q)

		cl->q = &noop_qdisc;

	cl->common.classid = classid;

	cl->tparent = parent;

net/sched/sch_drr.c

+2 −2
Original line number Diff line number Diff line
@@ -110,7 +110,7 @@ static int drr_change_class(struct Qdisc *sch, u32 classid, u32 parentid, 
	cl->refcnt	   = 1;

	cl->common.classid = classid;

	cl->quantum	   = quantum;

	cl->qdisc	   = qdisc_create_dflt(qdisc_dev(sch), sch->dev_queue,

	cl->qdisc	   = qdisc_create_dflt(sch->dev_queue,

					       &pfifo_qdisc_ops, classid);

	if (cl->qdisc == NULL)

		cl->qdisc = &noop_qdisc;
@@ -218,7 +218,7 @@ static int drr_graft_class(struct Qdisc *sch, unsigned long arg, 
	struct drr_class *cl = (struct drr_class *)arg;



	if (new == NULL) {

		new = qdisc_create_dflt(qdisc_dev(sch), sch->dev_queue,

		new = qdisc_create_dflt(sch->dev_queue,

					&pfifo_qdisc_ops, cl->common.classid);

		if (new == NULL)

			new = &noop_qdisc;

net/sched/sch_dsmark.c

+2 −4
Original line number Diff line number Diff line
@@ -61,8 +61,7 @@ static int dsmark_graft(struct Qdisc *sch, unsigned long arg, 
		sch, p, new, old);



	if (new == NULL) {

		new = qdisc_create_dflt(qdisc_dev(sch), sch->dev_queue,

					&pfifo_qdisc_ops,

		new = qdisc_create_dflt(sch->dev_queue, &pfifo_qdisc_ops,

					sch->handle);

		if (new == NULL)

			new = &noop_qdisc;
@@ -384,8 +383,7 @@ static int dsmark_init(struct Qdisc *sch, struct nlattr *opt) 
	p->default_index = default_index;

	p->set_tc_index = nla_get_flag(tb[TCA_DSMARK_SET_TC_INDEX]);



	p->q = qdisc_create_dflt(qdisc_dev(sch), sch->dev_queue,

				 &pfifo_qdisc_ops, sch->handle);

	p->q = qdisc_create_dflt(sch->dev_queue, &pfifo_qdisc_ops, sch->handle);

	if (p->q == NULL)

		p->q = &noop_qdisc;