| Message ID | 20140916073341.2597.36240.stgit@nitbit.x32 |
|---|---|
| State | Accepted, archived |
| Delegated to: | David Miller |
| Headers | show |
On Tue, Sep 16, 2014 at 12:33 AM, John Fastabend <john.fastabend@gmail.com> wrote: > This ensures the tcf_exts_init() is called for all cases. > > Signed-off-by: John Fastabend <john.r.fastabend@intel.com> Fixes: commit 952313bd62589cae216a57 ("net: sched: cls_cgroup use RCU") Acked-by: Cong Wang <cwang@twopensource.com> -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
From: John Fastabend <john.fastabend@gmail.com> Date: Tue, 16 Sep 2014 00:33:42 -0700 > This ensures the tcf_exts_init() is called for all cases. > > Signed-off-by: John Fastabend <john.r.fastabend@intel.com> Applied, thanks. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/net/sched/cls_cgroup.c b/net/sched/cls_cgroup.c index 10c7ffd..15c34d4 100644 --- a/net/sched/cls_cgroup.c +++ b/net/sched/cls_cgroup.c @@ -116,12 +116,11 @@ static int cls_cgroup_change(struct net *net, struct sk_buff *in_skb, if (!new) return -ENOBUFS; - if (head) { + tcf_exts_init(&new->exts, TCA_CGROUP_ACT, TCA_CGROUP_POLICE); + if (head) new->handle = head->handle; - } else { - tcf_exts_init(&new->exts, TCA_CGROUP_ACT, TCA_CGROUP_POLICE); + else new->handle = handle; - } new->tp = tp; err = nla_parse_nested(tb, TCA_CGROUP_MAX, tca[TCA_OPTIONS],
This ensures the tcf_exts_init() is called for all cases. Signed-off-by: John Fastabend <john.r.fastabend@intel.com> --- net/sched/cls_cgroup.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html