移去rt

hc

2023-12-08 01573e231f18eb2d99162747186f59511f56b64d

 kernel/net/decnet/dn_fib.c
..
..
@@ -42,7 +42,7 @@
42
42
 #include <net/dn_fib.h>
43
43
 #include <net/dn_neigh.h>
44
44
 #include <net/dn_dev.h>
45
-#include <net/nexthop.h>
45
+#include <net/rtnh.h>
46
46
 
47
47
 #define RT_MIN_TABLE 1
48
48
 
..
..
@@ -282,7 +282,7 @@
282
282
 	    (nhs = dn_fib_count_nhs(attrs[RTA_MULTIPATH])) == 0)
283
283
 		goto err_inval;
284
284
 
285
-	fi = kzalloc(sizeof(*fi)+nhs*sizeof(struct dn_fib_nh), GFP_KERNEL);
285
+	fi = kzalloc(struct_size(fi, fib_nh, nhs), GFP_KERNEL);
286
286
 	err = -ENOBUFS;
287
287
 	if (fi == NULL)
288
288
 		goto failure;
..
..
@@ -517,8 +517,8 @@
517
517
 	if (!net_eq(net, &init_net))
518
518
 		return -EINVAL;
519
519
 
520
-	err = nlmsg_parse(nlh, sizeof(*r), attrs, RTA_MAX, rtm_dn_policy,
521
-			  extack);
520
+	err = nlmsg_parse_deprecated(nlh, sizeof(*r), attrs, RTA_MAX,
521
+				     rtm_dn_policy, extack);
522
522
 	if (err < 0)
523
523
 		return err;
524
524
 
..
..
@@ -544,8 +544,8 @@
544
544
 	if (!net_eq(net, &init_net))
545
545
 		return -EINVAL;
546
546
 
547
-	err = nlmsg_parse(nlh, sizeof(*r), attrs, RTA_MAX, rtm_dn_policy,
548
-			  extack);
547
+	err = nlmsg_parse_deprecated(nlh, sizeof(*r), attrs, RTA_MAX,
548
+				     rtm_dn_policy, extack);
549
549
 	if (err < 0)
550
550
 		return err;
551
551