* [PATCH net-next 1/2] qdisc: make args to qdisc_create_default const
@ 2013-08-31 17:15 Stephen Hemminger
2013-08-31 22:10 ` David Miller
0 siblings, 1 reply; 2+ messages in thread
From: Stephen Hemminger @ 2013-08-31 17:15 UTC (permalink / raw)
To: David Miller; +Cc: netdev
Fixes warnings introduced by the qdisc default patch.
Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
--- a/include/net/sch_generic.h 2013-08-31 09:40:20.933206054 -0700
+++ b/include/net/sch_generic.h 2013-08-31 09:50:18.309178508 -0700
@@ -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);
--- a/net/sched/sch_generic.c 2013-08-31 09:40:20.949205839 -0700
+++ b/net/sched/sch_generic.c 2013-08-31 09:50:18.313178455 -0700
@@ -534,7 +534,7 @@ struct Qdisc_ops pfifo_fast_ops __read_m
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;
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [PATCH net-next 1/2] qdisc: make args to qdisc_create_default const
2013-08-31 17:15 [PATCH net-next 1/2] qdisc: make args to qdisc_create_default const Stephen Hemminger
@ 2013-08-31 22:10 ` David Miller
0 siblings, 0 replies; 2+ messages in thread
From: David Miller @ 2013-08-31 22:10 UTC (permalink / raw)
To: stephen; +Cc: netdev
From: Stephen Hemminger <stephen@networkplumber.org>
Date: Sat, 31 Aug 2013 10:15:50 -0700
> Fixes warnings introduced by the qdisc default patch.
>
> Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
Applied.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2013-08-31 22:10 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-08-31 17:15 [PATCH net-next 1/2] qdisc: make args to qdisc_create_default const Stephen Hemminger
2013-08-31 22:10 ` David Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).