diff options
| author |   Cong Wang <xiyou.wangcong@gmail.com> | 2019-02-20 21:37:42 -0800 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2019-02-22 15:26:51 -0800 |
| commit | 14215108a1fd7e002c0a1f9faf8fbaf41fdda50d (patch) | |
| tree | c56c457e345a93a42c47d67d58961a534b3e663e /net/sched/cls_fw.c | |
| parent | Merge tag 'wireless-drivers-next-for-davem-2019-02-22' of git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers-next (diff) | |
| download | linux-dev-14215108a1fd7e002c0a1f9faf8fbaf41fdda50d.tar.xz linux-dev-14215108a1fd7e002c0a1f9faf8fbaf41fdda50d.zip | |
net_sched: initialize net pointer inside tcf_exts_init()
For tcindex filter, it is too late to initialize the
net pointer in tcf_exts_validate(), as tcf_exts_get_net()
requires a non-NULL net pointer. We can just move its
initialization into tcf_exts_init(), which just requires
an additional parameter.
This makes the code in tcindex_alloc_perfect_hash()
prettier.
Cc: Jamal Hadi Salim <jhs@mojatatu.com>
Cc: Jiri Pirko <jiri@resnulli.us>
Signed-off-by: Cong Wang <xiyou.wangcong@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to '')
| -rw-r--r-- | net/sched/cls_fw.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/net/sched/cls_fw.c b/net/sched/cls_fw.c index 4e34966f2ae2..456ee6e62dfa 100644 --- a/net/sched/cls_fw.c +++ b/net/sched/cls_fw.c @@ -285,7 +285,8 @@ static int fw_change(struct net *net, struct sk_buff *in_skb, #endif /* CONFIG_NET_CLS_IND */ fnew->tp = f->tp; - err = tcf_exts_init(&fnew->exts, TCA_FW_ACT, TCA_FW_POLICE); + err = tcf_exts_init(&fnew->exts, net, TCA_FW_ACT, + TCA_FW_POLICE); if (err < 0) { kfree(fnew); return err; @@ -334,7 +335,7 @@ static int fw_change(struct net *net, struct sk_buff *in_skb, if (f == NULL) return -ENOBUFS; - err = tcf_exts_init(&f->exts, TCA_FW_ACT, TCA_FW_POLICE); + err = tcf_exts_init(&f->exts, net, TCA_FW_ACT, TCA_FW_POLICE); if (err < 0) goto errout; f->id = handle; |