diff options
Diffstat (limited to 'net/sched/sch_api.c')
-rw-r--r-- | net/sched/sch_api.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/net/sched/sch_api.c b/net/sched/sch_api.c index 07977f8f2679..97c1c75d5c78 100644 --- a/net/sched/sch_api.c +++ b/net/sched/sch_api.c | |||
@@ -760,15 +760,14 @@ graft: | |||
760 | } | 760 | } |
761 | 761 | ||
762 | static int tc_fill_qdisc(struct sk_buff *skb, struct Qdisc *q, u32 clid, | 762 | static int tc_fill_qdisc(struct sk_buff *skb, struct Qdisc *q, u32 clid, |
763 | u32 pid, u32 seq, unsigned flags, int event) | 763 | u32 pid, u32 seq, u16 flags, int event) |
764 | { | 764 | { |
765 | struct tcmsg *tcm; | 765 | struct tcmsg *tcm; |
766 | struct nlmsghdr *nlh; | 766 | struct nlmsghdr *nlh; |
767 | unsigned char *b = skb->tail; | 767 | unsigned char *b = skb->tail; |
768 | struct gnet_dump d; | 768 | struct gnet_dump d; |
769 | 769 | ||
770 | nlh = NLMSG_PUT(skb, pid, seq, event, sizeof(*tcm)); | 770 | nlh = NLMSG_NEW(skb, pid, seq, event, sizeof(*tcm), flags); |
771 | nlh->nlmsg_flags = flags; | ||
772 | tcm = NLMSG_DATA(nlh); | 771 | tcm = NLMSG_DATA(nlh); |
773 | tcm->tcm_family = AF_UNSPEC; | 772 | tcm->tcm_family = AF_UNSPEC; |
774 | tcm->tcm_ifindex = q->dev->ifindex; | 773 | tcm->tcm_ifindex = q->dev->ifindex; |
@@ -997,7 +996,7 @@ out: | |||
997 | 996 | ||
998 | static int tc_fill_tclass(struct sk_buff *skb, struct Qdisc *q, | 997 | static int tc_fill_tclass(struct sk_buff *skb, struct Qdisc *q, |
999 | unsigned long cl, | 998 | unsigned long cl, |
1000 | u32 pid, u32 seq, unsigned flags, int event) | 999 | u32 pid, u32 seq, u16 flags, int event) |
1001 | { | 1000 | { |
1002 | struct tcmsg *tcm; | 1001 | struct tcmsg *tcm; |
1003 | struct nlmsghdr *nlh; | 1002 | struct nlmsghdr *nlh; |
@@ -1005,8 +1004,7 @@ static int tc_fill_tclass(struct sk_buff *skb, struct Qdisc *q, | |||
1005 | struct gnet_dump d; | 1004 | struct gnet_dump d; |
1006 | struct Qdisc_class_ops *cl_ops = q->ops->cl_ops; | 1005 | struct Qdisc_class_ops *cl_ops = q->ops->cl_ops; |
1007 | 1006 | ||
1008 | nlh = NLMSG_PUT(skb, pid, seq, event, sizeof(*tcm)); | 1007 | nlh = NLMSG_NEW(skb, pid, seq, event, sizeof(*tcm), flags); |
1009 | nlh->nlmsg_flags = flags; | ||
1010 | tcm = NLMSG_DATA(nlh); | 1008 | tcm = NLMSG_DATA(nlh); |
1011 | tcm->tcm_family = AF_UNSPEC; | 1009 | tcm->tcm_family = AF_UNSPEC; |
1012 | tcm->tcm_ifindex = q->dev->ifindex; | 1010 | tcm->tcm_ifindex = q->dev->ifindex; |