From 12783dd03d04e37e6b10e5de320b0261bb27946c Mon Sep 17 00:00:00 2001 From: stephen hemminger Date: Sat, 31 Aug 2013 10:15:50 -0700 Subject: [PATCH] qdisc: make args to qdisc_create_default const Fixes warnings introduced by the qdisc default patch. Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller --- trunk/linux-3.4.x/include/net/sch_generic.h | 4 ++-- trunk/linux-3.4.x/net/sched/sch_generic.c | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/trunk/linux-3.4.x/include/net/sch_generic.h b/trunk/linux-3.4.x/include/net/sch_generic.h index 6c0b75596..531dc81fd 100644 --- a/trunk/linux-3.4.x/include/net/sch_generic.h +++ b/trunk/linux-3.4.x/include/net/sch_generic.h @@ -367,9 +367,9 @@ 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 netdev_queue *dev_queue, - struct Qdisc_ops *ops); + const struct Qdisc_ops *ops); extern struct Qdisc *qdisc_create_dflt(struct netdev_queue *dev_queue, - struct Qdisc_ops *ops, u32 parentid); + const struct Qdisc_ops *ops, u32 parentid); extern void __qdisc_calculate_pkt_len(struct sk_buff *skb, const struct qdisc_size_table *stab); extern void tcf_destroy(struct tcf_proto *tp); diff --git a/trunk/linux-3.4.x/net/sched/sch_generic.c b/trunk/linux-3.4.x/net/sched/sch_generic.c index 1b73c25cd..29ec7a06e 100644 --- a/trunk/linux-3.4.x/net/sched/sch_generic.c +++ b/trunk/linux-3.4.x/net/sched/sch_generic.c @@ -528,7 +528,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; @@ -572,7 +572,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;