summaryrefslogtreecommitdiffstats
path: root/net/ipv4/devinet.c
diff options
context:
space:
mode:
authorJohannes Berg <johannes.berg@intel.com>2017-04-12 08:34:07 -0400
committerDavid S. Miller <davem@davemloft.net>2017-04-13 13:58:22 -0400
commitfceb6435e85298f747fee938415057af837f5a8a (patch)
tree45bceaf19df703caa5e7ea839f7b35a7f9ebc332 /net/ipv4/devinet.c
parentba0dc5f6e0ba5a5d2f575bcdb35e5d1960cf7c04 (diff)
netlink: pass extended ACK struct to parsing functions
Pass the new extended ACK reporting struct to all of the generic netlink parsing functions. For now, pass NULL in almost all callers (except for some in the core.) Signed-off-by: Johannes Berg <johannes.berg@intel.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/devinet.c')
-rw-r--r--net/ipv4/devinet.c12
1 files changed, 7 insertions, 5 deletions
diff --git a/net/ipv4/devinet.c b/net/ipv4/devinet.c
index 6d3602ec640c..f33f53791f50 100644
--- a/net/ipv4/devinet.c
+++ b/net/ipv4/devinet.c
@@ -582,7 +582,8 @@ static int inet_rtm_deladdr(struct sk_buff *skb, struct nlmsghdr *nlh)
582 582
583 ASSERT_RTNL(); 583 ASSERT_RTNL();
584 584
585 err = nlmsg_parse(nlh, sizeof(*ifm), tb, IFA_MAX, ifa_ipv4_policy); 585 err = nlmsg_parse(nlh, sizeof(*ifm), tb, IFA_MAX, ifa_ipv4_policy,
586 NULL);
586 if (err < 0) 587 if (err < 0)
587 goto errout; 588 goto errout;
588 589
@@ -752,7 +753,8 @@ static struct in_ifaddr *rtm_to_ifaddr(struct net *net, struct nlmsghdr *nlh,
752 struct in_device *in_dev; 753 struct in_device *in_dev;
753 int err; 754 int err;
754 755
755 err = nlmsg_parse(nlh, sizeof(*ifm), tb, IFA_MAX, ifa_ipv4_policy); 756 err = nlmsg_parse(nlh, sizeof(*ifm), tb, IFA_MAX, ifa_ipv4_policy,
757 NULL);
756 if (err < 0) 758 if (err < 0)
757 goto errout; 759 goto errout;
758 760
@@ -1717,7 +1719,7 @@ static int inet_validate_link_af(const struct net_device *dev,
1717 if (dev && !__in_dev_get_rtnl(dev)) 1719 if (dev && !__in_dev_get_rtnl(dev))
1718 return -EAFNOSUPPORT; 1720 return -EAFNOSUPPORT;
1719 1721
1720 err = nla_parse_nested(tb, IFLA_INET_MAX, nla, inet_af_policy); 1722 err = nla_parse_nested(tb, IFLA_INET_MAX, nla, inet_af_policy, NULL);
1721 if (err < 0) 1723 if (err < 0)
1722 return err; 1724 return err;
1723 1725
@@ -1745,7 +1747,7 @@ static int inet_set_link_af(struct net_device *dev, const struct nlattr *nla)
1745 if (!in_dev) 1747 if (!in_dev)
1746 return -EAFNOSUPPORT; 1748 return -EAFNOSUPPORT;
1747 1749
1748 if (nla_parse_nested(tb, IFLA_INET_MAX, nla, NULL) < 0) 1750 if (nla_parse_nested(tb, IFLA_INET_MAX, nla, NULL, NULL) < 0)
1749 BUG(); 1751 BUG();
1750 1752
1751 if (tb[IFLA_INET_CONF]) { 1753 if (tb[IFLA_INET_CONF]) {
@@ -1882,7 +1884,7 @@ static int inet_netconf_get_devconf(struct sk_buff *in_skb,
1882 int err; 1884 int err;
1883 1885
1884 err = nlmsg_parse(nlh, sizeof(*ncm), tb, NETCONFA_MAX, 1886 err = nlmsg_parse(nlh, sizeof(*ncm), tb, NETCONFA_MAX,
1885 devconf_ipv4_policy); 1887 devconf_ipv4_policy, NULL);
1886 if (err < 0) 1888 if (err < 0)
1887 goto errout; 1889 goto errout;
1888 1890