forked from ~ljy/RK356X_SDK_RELEASE

blame | history | patch | commit | commitdiff
hc
2024-10-22 8ac6c7a54ed1b98d142dce24b11c6de6a1e239a5 
 kernel/net/sched/cls_fw.c
....@@ -210,11 +210,6 @@
210210 	if (err < 0)
211211 		return err;
212212 
213
-	if (tb[TCA_FW_CLASSID]) {
214
-		f->res.classid = nla_get_u32(tb[TCA_FW_CLASSID]);
215
-		tcf_bind_filter(tp, &f->res, base);
216
-	}
217
-
218213 	if (tb[TCA_FW_INDEV]) {
219214 		int ret;
220215 		ret = tcf_change_indev(net, tb[TCA_FW_INDEV], extack);
....@@ -230,6 +225,11 @@
230225 			return err;
231226 	} else if (head->mask != 0xFFFFFFFF)
232227 		return err;
228
+
229
+	if (tb[TCA_FW_CLASSID]) {
230
+		f->res.classid = nla_get_u32(tb[TCA_FW_CLASSID]);
231
+		tcf_bind_filter(tp, &f->res, base);
232
+	}
233233 
234234 	return 0;
235235 }
....@@ -266,7 +266,6 @@
266266 			return -ENOBUFS;
267267 
268268 		fnew->id = f->id;
269
-		fnew->res = f->res;
270269 		fnew->ifindex = f->ifindex;
271270 		fnew->tp = f->tp;
272271