diff options
-rw-r--r-- | include/net/sch_generic.h | 4 | ||||
-rw-r--r-- | net/sched/sch_generic.c | 5 |
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); | |||
370 | void qdisc_destroy(struct Qdisc *qdisc); | 370 | void qdisc_destroy(struct Qdisc *qdisc); |
371 | void qdisc_tree_decrease_qlen(struct Qdisc *qdisc, unsigned int n); | 371 | void qdisc_tree_decrease_qlen(struct Qdisc *qdisc, unsigned int n); |
372 | struct Qdisc *qdisc_alloc(struct netdev_queue *dev_queue, | 372 | struct Qdisc *qdisc_alloc(struct netdev_queue *dev_queue, |
373 | struct Qdisc_ops *ops); | 373 | const struct Qdisc_ops *ops); |
374 | struct Qdisc *qdisc_create_dflt(struct netdev_queue *dev_queue, | 374 | struct Qdisc *qdisc_create_dflt(struct netdev_queue *dev_queue, |
375 | struct Qdisc_ops *ops, u32 parentid); | 375 | const struct Qdisc_ops *ops, u32 parentid); |
376 | void __qdisc_calculate_pkt_len(struct sk_buff *skb, | 376 | void __qdisc_calculate_pkt_len(struct sk_buff *skb, |
377 | const struct qdisc_size_table *stab); | 377 | const struct qdisc_size_table *stab); |
378 | void tcf_destroy(struct tcf_proto *tp); | 378 | 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 = { | |||
534 | static struct lock_class_key qdisc_tx_busylock; | 534 | static struct lock_class_key qdisc_tx_busylock; |
535 | 535 | ||
536 | struct Qdisc *qdisc_alloc(struct netdev_queue *dev_queue, | 536 | struct Qdisc *qdisc_alloc(struct netdev_queue *dev_queue, |
537 | struct Qdisc_ops *ops) | 537 | const struct Qdisc_ops *ops) |
538 | { | 538 | { |
539 | void *p; | 539 | void *p; |
540 | struct Qdisc *sch; | 540 | struct Qdisc *sch; |
@@ -578,7 +578,8 @@ errout: | |||
578 | } | 578 | } |
579 | 579 | ||
580 | struct Qdisc *qdisc_create_dflt(struct netdev_queue *dev_queue, | 580 | struct Qdisc *qdisc_create_dflt(struct netdev_queue *dev_queue, |
581 | struct Qdisc_ops *ops, unsigned int parentid) | 581 | const struct Qdisc_ops *ops, |
582 | unsigned int parentid) | ||
582 | { | 583 | { |
583 | struct Qdisc *sch; | 584 | struct Qdisc *sch; |
584 | 585 | ||