aboutsummaryrefslogtreecommitdiffstats
path: root/net/ipv4/devinet.c
diff options
context:
space:
mode:
Diffstat (limited to 'net/ipv4/devinet.c')
-rw-r--r--net/ipv4/devinet.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/net/ipv4/devinet.c b/net/ipv4/devinet.c
index e1e2ec0525e6..a4573bccd6da 100644
--- a/net/ipv4/devinet.c
+++ b/net/ipv4/devinet.c
@@ -444,7 +444,7 @@ static void check_lifetime(struct work_struct *work);
444static DECLARE_DELAYED_WORK(check_lifetime_work, check_lifetime); 444static DECLARE_DELAYED_WORK(check_lifetime_work, check_lifetime);
445 445
446static int __inet_insert_ifa(struct in_ifaddr *ifa, struct nlmsghdr *nlh, 446static int __inet_insert_ifa(struct in_ifaddr *ifa, struct nlmsghdr *nlh,
447 u32 portid) 447 u32 portid, struct netlink_ext_ack *extack)
448{ 448{
449 struct in_device *in_dev = ifa->ifa_dev; 449 struct in_device *in_dev = ifa->ifa_dev;
450 struct in_ifaddr *ifa1, **ifap, **last_primary; 450 struct in_ifaddr *ifa1, **ifap, **last_primary;
@@ -489,6 +489,7 @@ static int __inet_insert_ifa(struct in_ifaddr *ifa, struct nlmsghdr *nlh,
489 */ 489 */
490 ivi.ivi_addr = ifa->ifa_address; 490 ivi.ivi_addr = ifa->ifa_address;
491 ivi.ivi_dev = ifa->ifa_dev; 491 ivi.ivi_dev = ifa->ifa_dev;
492 ivi.extack = extack;
492 ret = blocking_notifier_call_chain(&inetaddr_validator_chain, 493 ret = blocking_notifier_call_chain(&inetaddr_validator_chain,
493 NETDEV_UP, &ivi); 494 NETDEV_UP, &ivi);
494 ret = notifier_to_errno(ret); 495 ret = notifier_to_errno(ret);
@@ -521,7 +522,7 @@ static int __inet_insert_ifa(struct in_ifaddr *ifa, struct nlmsghdr *nlh,
521 522
522static int inet_insert_ifa(struct in_ifaddr *ifa) 523static int inet_insert_ifa(struct in_ifaddr *ifa)
523{ 524{
524 return __inet_insert_ifa(ifa, NULL, 0); 525 return __inet_insert_ifa(ifa, NULL, 0, NULL);
525} 526}
526 527
527static int inet_set_ifa(struct net_device *dev, struct in_ifaddr *ifa) 528static int inet_set_ifa(struct net_device *dev, struct in_ifaddr *ifa)
@@ -902,7 +903,8 @@ static int inet_rtm_newaddr(struct sk_buff *skb, struct nlmsghdr *nlh,
902 return ret; 903 return ret;
903 } 904 }
904 } 905 }
905 return __inet_insert_ifa(ifa, nlh, NETLINK_CB(skb).portid); 906 return __inet_insert_ifa(ifa, nlh, NETLINK_CB(skb).portid,
907 extack);
906 } else { 908 } else {
907 inet_free_ifa(ifa); 909 inet_free_ifa(ifa);
908 910