diff options
| author | PixelBot AutoMerger <android-nexus-securitybot@system.gserviceaccount.com> | 2023-09-10 18:09:41 -0700 |
|---|---|---|
| committer | Pindar Yang <pindaryang@google.com> | 2023-09-12 03:59:04 +0000 |
| commit | 7a484ed616836118b3b3860b7286220c9ee7389b (patch) | |
| tree | 31eb0d38cebde7add8dd41f38b4cb673fc7dbed4 | |
| parent | d505795985daba5e5838bd18aa4b3893c0849631 (diff) | |
| parent | 7b0944645172e8b690d42f68c8973ccb0ca45730 (diff) | |
| download | msm-7a484ed616836118b3b3860b7286220c9ee7389b.tar.gz | |
Merge android-msm-pixel-4.19-udc into android-msm-pixel-4.19-udc-qpr1
Bug: 292447561
SBMerger: 558810260
Change-Id: I90d8762ecc35a48d4a814dc9db785ba9143f51fa
Signed-off-by: SecurityBot <android-nexus-securitybot@system.gserviceaccount.com>
| -rw-r--r-- | net/sched/cls_fw.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/net/sched/cls_fw.c b/net/sched/cls_fw.c index cb2c62605fc7..5284a473c697 100644 --- a/net/sched/cls_fw.c +++ b/net/sched/cls_fw.c @@ -221,11 +221,6 @@ static int fw_set_parms(struct net *net, struct tcf_proto *tp, if (err < 0) return err; - if (tb[TCA_FW_CLASSID]) { - f->res.classid = nla_get_u32(tb[TCA_FW_CLASSID]); - tcf_bind_filter(tp, &f->res, base); - } - #ifdef CONFIG_NET_CLS_IND if (tb[TCA_FW_INDEV]) { int ret; @@ -244,6 +239,11 @@ static int fw_set_parms(struct net *net, struct tcf_proto *tp, } else if (head->mask != 0xFFFFFFFF) return err; + if (tb[TCA_FW_CLASSID]) { + f->res.classid = nla_get_u32(tb[TCA_FW_CLASSID]); + tcf_bind_filter(tp, &f->res, base); + } + return 0; } |