summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorstephen hemminger <stephen@networkplumber.org>2013-08-31 10:15:50 -0700
committerDavid S. Miller <davem@davemloft.net>2013-08-31 18:09:45 -0400
commitd2a7f269f91299b8e5f6c7d2a41ba46248d73d24 (patch)
tree91016a49e4e244f1f13ec067f816e6166801b70f
parent6da7c8fcbcbdb50ec68c61b40d554c74850fdb91 (diff)
downloadblackbird-op-linux-d2a7f269f91299b8e5f6c7d2a41ba46248d73d24.tar.gz
blackbird-op-linux-d2a7f269f91299b8e5f6c7d2a41ba46248d73d24.zip
qdisc: make args to qdisc_create_default const
Fixes warnings introduced by the qdisc default patch. Signed-off-by: Stephen Hemminger <stephen@networkplumber.org> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--include/net/sch_generic.h4
-rw-r--r--net/sched/sch_generic.c5
2 files changed, 5 insertions, 4 deletions
diff --git a/include/net/sch_generic.h b/include/net/sch_generic.h
index 2e31bf14df00..f4eb365f7dcd 100644
--- a/include/net/sch_generic.h
+++ b/include/net/sch_generic.h
@@ -370,9 +370,9 @@ void qdisc_reset(struct Qdisc *qdisc);
void qdisc_destroy(struct Qdisc *qdisc);
void qdisc_tree_decrease_qlen(struct Qdisc *qdisc, unsigned int n);
struct Qdisc *qdisc_alloc(struct netdev_queue *dev_queue,
- struct Qdisc_ops *ops);
+ const struct Qdisc_ops *ops);
struct Qdisc *qdisc_create_dflt(struct netdev_queue *dev_queue,
- struct Qdisc_ops *ops, u32 parentid);
+ const struct Qdisc_ops *ops, u32 parentid);
void __qdisc_calculate_pkt_len(struct sk_buff *skb,
const struct qdisc_size_table *stab);
void tcf_destroy(struct tcf_proto *tp);
diff --git a/net/sched/sch_generic.c b/net/sched/sch_generic.c
index 5078e0c5db8d..6b021106542c 100644
--- a/net/sched/sch_generic.c
+++ b/net/sched/sch_generic.c
@@ -534,7 +534,7 @@ struct Qdisc_ops pfifo_fast_ops __read_mostly = {
static struct lock_class_key qdisc_tx_busylock;
struct Qdisc *qdisc_alloc(struct netdev_queue *dev_queue,
- struct Qdisc_ops *ops)
+ const struct Qdisc_ops *ops)
{
void *p;
struct Qdisc *sch;
@@ -578,7 +578,8 @@ errout:
}
struct Qdisc *qdisc_create_dflt(struct netdev_queue *dev_queue,
- struct Qdisc_ops *ops, unsigned int parentid)
+ const struct Qdisc_ops *ops,
+ unsigned int parentid)
{
struct Qdisc *sch;
OpenPOWER on IntegriCloud