Skip to content

L
linux
Commit d1f271d6 authored by David S. Miller's avatar David S. Miller
Browse files
Options

Merge branch 'net-add-netlink_ext_ack-support-to-rtnl_link_ops' 

Matthias Schiffer says:

====================
net: add netlink_ext_ack support to rtnl_link_ops

Same changes as http://patchwork.ozlabs.org/patch/780351/ , split into
separate patches for each rtnl_link_ops field as requested.
====================
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents dacdbb4d d116ffc7
Hide whitespace changes
Inline Side-by-side
Showing with 190 additions and 107 deletions
drivers/infiniband/ulp/ipoib/ipoib_netlink.c
View file @ d1f271d6
...@@ -64,8 +64,9 @@ static int ipoib_fill_info(struct sk_buff *skb, const struct net_device *dev) ...@@ -64,8 +64,9 @@ static int ipoib_fill_info(struct sk_buff *skb, const struct net_device *dev)
return -EMSGSIZE; return -EMSGSIZE;
} }
static int ipoib_changelink(struct net_device *dev, static int ipoib_changelink(struct net_device *dev, struct nlattr *tb[],
struct nlattr *tb[], struct nlattr *data[]) struct nlattr *data[],
struct netlink_ext_ack *extack)
{ {
u16 mode, umcast; u16 mode, umcast;
int ret = 0; int ret = 0;
...@@ -93,7 +94,8 @@ static int ipoib_changelink(struct net_device *dev, ...@@ -93,7 +94,8 @@ static int ipoib_changelink(struct net_device *dev,
} }
static int ipoib_new_child_link(struct net *src_net, struct net_device *dev, static int ipoib_new_child_link(struct net *src_net, struct net_device *dev,
struct nlattr *tb[], struct nlattr *data[]) struct nlattr *tb[], struct nlattr *data[],
struct netlink_ext_ack *extack)
{ {
struct net_device *pdev; struct net_device *pdev;
struct ipoib_dev_priv *ppriv; struct ipoib_dev_priv *ppriv;
...@@ -133,7 +135,7 @@ static int ipoib_new_child_link(struct net *src_net, struct net_device *dev, ...@@ -133,7 +135,7 @@ static int ipoib_new_child_link(struct net *src_net, struct net_device *dev,
child_pkey, IPOIB_RTNL_CHILD); child_pkey, IPOIB_RTNL_CHILD);
if (!err && data) if (!err && data)
err = ipoib_changelink(dev, tb, data); err = ipoib_changelink(dev, tb, data, extack);
return err; return err;
} }
......
drivers/net/bonding/bond_netlink.c
View file @ d1f271d6
...@@ -118,7 +118,8 @@ static const struct nla_policy bond_slave_policy[IFLA_BOND_SLAVE_MAX + 1] = { ...@@ -118,7 +118,8 @@ static const struct nla_policy bond_slave_policy[IFLA_BOND_SLAVE_MAX + 1] = {
[IFLA_BOND_SLAVE_QUEUE_ID] = { .type = NLA_U16 }, [IFLA_BOND_SLAVE_QUEUE_ID] = { .type = NLA_U16 },
}; };
static int bond_validate(struct nlattr *tb[], struct nlattr *data[]) static int bond_validate(struct nlattr *tb[], struct nlattr *data[],
struct netlink_ext_ack *extack)
{ {
if (tb[IFLA_ADDRESS]) { if (tb[IFLA_ADDRESS]) {
if (nla_len(tb[IFLA_ADDRESS]) != ETH_ALEN) if (nla_len(tb[IFLA_ADDRESS]) != ETH_ALEN)
...@@ -131,7 +132,8 @@ static int bond_validate(struct nlattr *tb[], struct nlattr *data[]) ...@@ -131,7 +132,8 @@ static int bond_validate(struct nlattr *tb[], struct nlattr *data[])
static int bond_slave_changelink(struct net_device *bond_dev, static int bond_slave_changelink(struct net_device *bond_dev,
struct net_device *slave_dev, struct net_device *slave_dev,
struct nlattr *tb[], struct nlattr *data[]) struct nlattr *tb[], struct nlattr *data[],
struct netlink_ext_ack *extack)
{ {
struct bonding *bond = netdev_priv(bond_dev); struct bonding *bond = netdev_priv(bond_dev);
struct bond_opt_value newval; struct bond_opt_value newval;
...@@ -156,8 +158,9 @@ static int bond_slave_changelink(struct net_device *bond_dev, ...@@ -156,8 +158,9 @@ static int bond_slave_changelink(struct net_device *bond_dev,
return 0; return 0;
} }
static int bond_changelink(struct net_device *bond_dev, static int bond_changelink(struct net_device *bond_dev, struct nlattr *tb[],
struct nlattr *tb[], struct nlattr *data[]) struct nlattr *data[],
struct netlink_ext_ack *extack)
{ {
struct bonding *bond = netdev_priv(bond_dev); struct bonding *bond = netdev_priv(bond_dev);
struct bond_opt_value newval; struct bond_opt_value newval;
...@@ -438,11 +441,12 @@ static int bond_changelink(struct net_device *bond_dev, ...@@ -438,11 +441,12 @@ static int bond_changelink(struct net_device *bond_dev,
} }
static int bond_newlink(struct net *src_net, struct net_device *bond_dev, static int bond_newlink(struct net *src_net, struct net_device *bond_dev,
struct nlattr *tb[], struct nlattr *data[]) struct nlattr *tb[], struct nlattr *data[],
struct netlink_ext_ack *extack)
{ {
int err; int err;
err = bond_changelink(bond_dev, tb, data); err = bond_changelink(bond_dev, tb, data, extack);
if (err < 0) if (err < 0)
return err; return err;
......
drivers/net/caif/caif_hsi.c
View file @ d1f271d6
...@@ -1352,7 +1352,8 @@ static void cfhsi_netlink_parms(struct nlattr *data[], struct cfhsi *cfhsi) ...@@ -1352,7 +1352,8 @@ static void cfhsi_netlink_parms(struct nlattr *data[], struct cfhsi *cfhsi)
} }
static int caif_hsi_changelink(struct net_device *dev, struct nlattr *tb[], static int caif_hsi_changelink(struct net_device *dev, struct nlattr *tb[],
struct nlattr *data[]) struct nlattr *data[],
struct netlink_ext_ack *extack)
{ {
cfhsi_netlink_parms(data, netdev_priv(dev)); cfhsi_netlink_parms(data, netdev_priv(dev));
netdev_state_change(dev); netdev_state_change(dev);
...@@ -1399,7 +1400,8 @@ static int caif_hsi_fill_info(struct sk_buff *skb, const struct net_device *dev) ...@@ -1399,7 +1400,8 @@ static int caif_hsi_fill_info(struct sk_buff *skb, const struct net_device *dev)
} }
static int caif_hsi_newlink(struct net *src_net, struct net_device *dev, static int caif_hsi_newlink(struct net *src_net, struct net_device *dev,
struct nlattr *tb[], struct nlattr *data[]) struct nlattr *tb[], struct nlattr *data[],
struct netlink_ext_ack *extack)
{ {
struct cfhsi *cfhsi = NULL; struct cfhsi *cfhsi = NULL;
struct cfhsi_ops *(*get_ops)(void); struct cfhsi_ops *(*get_ops)(void);
......
drivers/net/can/dev.c
View file @ d1f271d6
...@@ -848,7 +848,8 @@ static const struct nla_policy can_policy[IFLA_CAN_MAX + 1] = { ...@@ -848,7 +848,8 @@ static const struct nla_policy can_policy[IFLA_CAN_MAX + 1] = {
= { .len = sizeof(struct can_bittiming_const) }, = { .len = sizeof(struct can_bittiming_const) },
}; };
static int can_validate(struct nlattr *tb[], struct nlattr *data[]) static int can_validate(struct nlattr *tb[], struct nlattr *data[],
struct netlink_ext_ack *extack)
{ {
bool is_can_fd = false; bool is_can_fd = false;
...@@ -880,8 +881,9 @@ static int can_validate(struct nlattr *tb[], struct nlattr *data[]) ...@@ -880,8 +881,9 @@ static int can_validate(struct nlattr *tb[], struct nlattr *data[])
return 0; return 0;
} }
static int can_changelink(struct net_device *dev, static int can_changelink(struct net_device *dev, struct nlattr *tb[],
struct nlattr *tb[], struct nlattr *data[]) struct nlattr *data[],
struct netlink_ext_ack *extack)
{ {
struct can_priv *priv = netdev_priv(dev); struct can_priv *priv = netdev_priv(dev);
int err; int err;
...@@ -1146,7 +1148,8 @@ static int can_fill_xstats(struct sk_buff *skb, const struct net_device *dev) ...@@ -1146,7 +1148,8 @@ static int can_fill_xstats(struct sk_buff *skb, const struct net_device *dev)
} }
static int can_newlink(struct net *src_net, struct net_device *dev, static int can_newlink(struct net *src_net, struct net_device *dev,
struct nlattr *tb[], struct nlattr *data[]) struct nlattr *tb[], struct nlattr *data[],
struct netlink_ext_ack *extack)
{ {
return -EOPNOTSUPP; return -EOPNOTSUPP;
} }
......
drivers/net/can/vxcan.c
View file @ d1f271d6
...@@ -163,7 +163,8 @@ static void vxcan_setup(struct net_device *dev) ...@@ -163,7 +163,8 @@ static void vxcan_setup(struct net_device *dev)
static struct rtnl_link_ops vxcan_link_ops; static struct rtnl_link_ops vxcan_link_ops;
static int vxcan_newlink(struct net *net, struct net_device *dev, static int vxcan_newlink(struct net *net, struct net_device *dev,
struct nlattr *tb[], struct nlattr *data[]) struct nlattr *tb[], struct nlattr *data[],
struct netlink_ext_ack *extack)
{ {
struct vxcan_priv *priv; struct vxcan_priv *priv;
struct net_device *peer; struct net_device *peer;
......
drivers/net/dummy.c
View file @ d1f271d6
...@@ -356,7 +356,8 @@ static void dummy_setup(struct net_device *dev) ...@@ -356,7 +356,8 @@ static void dummy_setup(struct net_device *dev)
dev->max_mtu = ETH_MAX_MTU; dev->max_mtu = ETH_MAX_MTU;
} }
static int dummy_validate(struct nlattr *tb[], struct nlattr *data[]) static int dummy_validate(struct nlattr *tb[], struct nlattr *data[],
struct netlink_ext_ack *extack)
{ {
if (tb[IFLA_ADDRESS]) { if (tb[IFLA_ADDRESS]) {
if (nla_len(tb[IFLA_ADDRESS]) != ETH_ALEN) if (nla_len(tb[IFLA_ADDRESS]) != ETH_ALEN)
......
drivers/net/geneve.c
View file @ d1f271d6
...@@ -1058,7 +1058,8 @@ static const struct nla_policy geneve_policy[IFLA_GENEVE_MAX + 1] = { ...@@ -1058,7 +1058,8 @@ static const struct nla_policy geneve_policy[IFLA_GENEVE_MAX + 1] = {
[IFLA_GENEVE_UDP_ZERO_CSUM6_RX] = { .type = NLA_U8 }, [IFLA_GENEVE_UDP_ZERO_CSUM6_RX] = { .type = NLA_U8 },
}; };
static int geneve_validate(struct nlattr *tb[], struct nlattr *data[]) static int geneve_validate(struct nlattr *tb[], struct nlattr *data[],
struct netlink_ext_ack *extack)
{ {
if (tb[IFLA_ADDRESS]) { if (tb[IFLA_ADDRESS]) {
if (nla_len(tb[IFLA_ADDRESS]) != ETH_ALEN) if (nla_len(tb[IFLA_ADDRESS]) != ETH_ALEN)
...@@ -1181,7 +1182,8 @@ static void init_tnl_info(struct ip_tunnel_info *info, __u16 dst_port) ...@@ -1181,7 +1182,8 @@ static void init_tnl_info(struct ip_tunnel_info *info, __u16 dst_port)
} }
static int geneve_newlink(struct net *net, struct net_device *dev, static int geneve_newlink(struct net *net, struct net_device *dev,
struct nlattr *tb[], struct nlattr *data[]) struct nlattr *tb[], struct nlattr *data[],
struct netlink_ext_ack *extack)
{ {
bool use_udp6_rx_checksums = false; bool use_udp6_rx_checksums = false;
struct ip_tunnel_info info; struct ip_tunnel_info info;
......
drivers/net/gtp.c
View file @ d1f271d6
...@@ -636,7 +636,8 @@ static void gtp_hashtable_free(struct gtp_dev *gtp); ...@@ -636,7 +636,8 @@ static void gtp_hashtable_free(struct gtp_dev *gtp);
static int gtp_encap_enable(struct gtp_dev *gtp, struct nlattr *data[]); static int gtp_encap_enable(struct gtp_dev *gtp, struct nlattr *data[]);
static int gtp_newlink(struct net *src_net, struct net_device *dev, static int gtp_newlink(struct net *src_net, struct net_device *dev,
struct nlattr *tb[], struct nlattr *data[]) struct nlattr *tb[], struct nlattr *data[],
struct netlink_ext_ack *extack)
{ {
struct gtp_dev *gtp; struct gtp_dev *gtp;
struct gtp_net *gn; struct gtp_net *gn;
...@@ -697,7 +698,8 @@ static const struct nla_policy gtp_policy[IFLA_GTP_MAX + 1] = { ...@@ -697,7 +698,8 @@ static const struct nla_policy gtp_policy[IFLA_GTP_MAX + 1] = {
[IFLA_GTP_ROLE] = { .type = NLA_U32 }, [IFLA_GTP_ROLE] = { .type = NLA_U32 },
}; };
static int gtp_validate(struct nlattr *tb[], struct nlattr *data[]) static int gtp_validate(struct nlattr *tb[], struct nlattr *data[],
struct netlink_ext_ack *extack)
{ {
if (!data) if (!data)
return -EINVAL; return -EINVAL;
......
drivers/net/ifb.c
View file @ d1f271d6
...@@ -273,7 +273,8 @@ static int ifb_open(struct net_device *dev) ...@@ -273,7 +273,8 @@ static int ifb_open(struct net_device *dev)
return 0; return 0;
} }
static int ifb_validate(struct nlattr *tb[], struct nlattr *data[]) static int ifb_validate(struct nlattr *tb[], struct nlattr *data[],
struct netlink_ext_ack *extack)
{ {
if (tb[IFLA_ADDRESS]) { if (tb[IFLA_ADDRESS]) {
if (nla_len(tb[IFLA_ADDRESS]) != ETH_ALEN) if (nla_len(tb[IFLA_ADDRESS]) != ETH_ALEN)
......
drivers/net/ipvlan/ipvlan.h
View file @ d1f271d6
...@@ -140,7 +140,8 @@ unsigned int ipvlan_nf_input(void *priv, struct sk_buff *skb, ...@@ -140,7 +140,8 @@ unsigned int ipvlan_nf_input(void *priv, struct sk_buff *skb,
void ipvlan_count_rx(const struct ipvl_dev *ipvlan, void ipvlan_count_rx(const struct ipvl_dev *ipvlan,
unsigned int len, bool success, bool mcast); unsigned int len, bool success, bool mcast);
int ipvlan_link_new(struct net *src_net, struct net_device *dev, int ipvlan_link_new(struct net *src_net, struct net_device *dev,
struct nlattr *tb[], struct nlattr *data[]); struct nlattr *tb[], struct nlattr *data[],
struct netlink_ext_ack *extack);
void ipvlan_link_delete(struct net_device *dev, struct list_head *head); void ipvlan_link_delete(struct net_device *dev, struct list_head *head);
void ipvlan_link_setup(struct net_device *dev); void ipvlan_link_setup(struct net_device *dev);
int ipvlan_link_register(struct rtnl_link_ops *ops); int ipvlan_link_register(struct rtnl_link_ops *ops);
......
drivers/net/ipvlan/ipvlan_main.c
View file @ d1f271d6
...@@ -455,7 +455,8 @@ static const struct ethtool_ops ipvlan_ethtool_ops = { ...@@ -455,7 +455,8 @@ static const struct ethtool_ops ipvlan_ethtool_ops = {
}; };
static int ipvlan_nl_changelink(struct net_device *dev, static int ipvlan_nl_changelink(struct net_device *dev,
struct nlattr *tb[], struct nlattr *data[]) struct nlattr *tb[], struct nlattr *data[],
struct netlink_ext_ack *extack)
{ {
struct ipvl_dev *ipvlan = netdev_priv(dev); struct ipvl_dev *ipvlan = netdev_priv(dev);
struct ipvl_port *port = ipvlan_port_get_rtnl(ipvlan->phy_dev); struct ipvl_port *port = ipvlan_port_get_rtnl(ipvlan->phy_dev);
...@@ -476,7 +477,8 @@ static size_t ipvlan_nl_getsize(const struct net_device *dev) ...@@ -476,7 +477,8 @@ static size_t ipvlan_nl_getsize(const struct net_device *dev)
); );
} }
static int ipvlan_nl_validate(struct nlattr *tb[], struct nlattr *data[]) static int ipvlan_nl_validate(struct nlattr *tb[], struct nlattr *data[],
struct netlink_ext_ack *extack)
{ {
if (data && data[IFLA_IPVLAN_MODE]) { if (data && data[IFLA_IPVLAN_MODE]) {
u16 mode = nla_get_u16(data[IFLA_IPVLAN_MODE]); u16 mode = nla_get_u16(data[IFLA_IPVLAN_MODE]);
...@@ -508,7 +510,8 @@ static int ipvlan_nl_fillinfo(struct sk_buff *skb, ...@@ -508,7 +510,8 @@ static int ipvlan_nl_fillinfo(struct sk_buff *skb,
} }
int ipvlan_link_new(struct net *src_net, struct net_device *dev, int ipvlan_link_new(struct net *src_net, struct net_device *dev,
struct nlattr *tb[], struct nlattr *data[]) struct nlattr *tb[], struct nlattr *data[],
struct netlink_ext_ack *extack)
{ {
struct ipvl_dev *ipvlan = netdev_priv(dev); struct ipvl_dev *ipvlan = netdev_priv(dev);
struct ipvl_port *port; struct ipvl_port *port;
......
drivers/net/ipvlan/ipvtap.c
View file @ d1f271d6
...@@ -73,10 +73,9 @@ static void ipvtap_update_features(struct tap_dev *tap, ...@@ -73,10 +73,9 @@ static void ipvtap_update_features(struct tap_dev *tap,
netdev_update_features(vlan->dev); netdev_update_features(vlan->dev);
} }
static int ipvtap_newlink(struct net *src_net, static int ipvtap_newlink(struct net *src_net, struct net_device *dev,
struct net_device *dev, struct nlattr *tb[], struct nlattr *data[],
struct nlattr *tb[], struct netlink_ext_ack *extack)
struct nlattr *data[])
{ {
struct ipvtap_dev *vlantap = netdev_priv(dev); struct ipvtap_dev *vlantap = netdev_priv(dev);
int err; int err;
...@@ -98,7 +97,7 @@ static int ipvtap_newlink(struct net *src_net, ...@@ -98,7 +97,7 @@ static int ipvtap_newlink(struct net *src_net,
/* Don't put anything that may fail after macvlan_common_newlink /* Don't put anything that may fail after macvlan_common_newlink
* because we can't undo what it does. * because we can't undo what it does.
*/ */
err = ipvlan_link_new(src_net, dev, tb, data); err = ipvlan_link_new(src_net, dev, tb, data, extack);
if (err) { if (err) {
netdev_rx_handler_unregister(dev); netdev_rx_handler_unregister(dev);
return err; return err;
......
drivers/net/macsec.c
View file @ d1f271d6
...@@ -3056,7 +3056,8 @@ static void macsec_changelink_common(struct net_device *dev, ...@@ -3056,7 +3056,8 @@ static void macsec_changelink_common(struct net_device *dev,
} }
static int macsec_changelink(struct net_device *dev, struct nlattr *tb[], static int macsec_changelink(struct net_device *dev, struct nlattr *tb[],
struct nlattr *data[]) struct nlattr *data[],
struct netlink_ext_ack *extack)
{ {
if (!data) if (!data)
return 0; return 0;
...@@ -3203,7 +3204,8 @@ static int macsec_add_dev(struct net_device *dev, sci_t sci, u8 icv_len) ...@@ -3203,7 +3204,8 @@ static int macsec_add_dev(struct net_device *dev, sci_t sci, u8 icv_len)
} }
static int macsec_newlink(struct net *net, struct net_device *dev, static int macsec_newlink(struct net *net, struct net_device *dev,
struct nlattr *tb[], struct nlattr *data[]) struct nlattr *tb[], struct nlattr *data[],
struct netlink_ext_ack *extack)
{ {
struct macsec_dev *macsec = macsec_priv(dev); struct macsec_dev *macsec = macsec_priv(dev);
struct net_device *real_dev; struct net_device *real_dev;
...@@ -3285,7 +3287,8 @@ static int macsec_newlink(struct net *net, struct net_device *dev, ...@@ -3285,7 +3287,8 @@ static int macsec_newlink(struct net *net, struct net_device *dev,
return err; return err;
} }
static int macsec_validate_attr(struct nlattr *tb[], struct nlattr *data[]) static int macsec_validate_attr(struct nlattr *tb[], struct nlattr *data[],
struct netlink_ext_ack *extack)
{ {
u64 csid = MACSEC_DEFAULT_CIPHER_ID; u64 csid = MACSEC_DEFAULT_CIPHER_ID;
u8 icv_len = DEFAULT_ICV_LEN; u8 icv_len = DEFAULT_ICV_LEN;
......
drivers/net/macvlan.c
View file @ d1f271d6
...@@ -1162,7 +1162,8 @@ static void macvlan_port_destroy(struct net_device *dev) ...@@ -1162,7 +1162,8 @@ static void macvlan_port_destroy(struct net_device *dev)
kfree(port); kfree(port);
} }
static int macvlan_validate(struct nlattr *tb[], struct nlattr *data[]) static int macvlan_validate(struct nlattr *tb[], struct nlattr *data[],
struct netlink_ext_ack *extack)
{ {
if (tb[IFLA_ADDRESS]) { if (tb[IFLA_ADDRESS]) {
if (nla_len(tb[IFLA_ADDRESS]) != ETH_ALEN) if (nla_len(tb[IFLA_ADDRESS]) != ETH_ALEN)
...@@ -1390,7 +1391,8 @@ int macvlan_common_newlink(struct net *src_net, struct net_device *dev, ...@@ -1390,7 +1391,8 @@ int macvlan_common_newlink(struct net *src_net, struct net_device *dev,
EXPORT_SYMBOL_GPL(macvlan_common_newlink); EXPORT_SYMBOL_GPL(macvlan_common_newlink);
static int macvlan_newlink(struct net *src_net, struct net_device *dev, static int macvlan_newlink(struct net *src_net, struct net_device *dev,
struct nlattr *tb[], struct nlattr *data[]) struct nlattr *tb[], struct nlattr *data[],
struct netlink_ext_ack *extack)
{ {
return macvlan_common_newlink(src_net, dev, tb, data); return macvlan_common_newlink(src_net, dev, tb, data);
} }
...@@ -1408,7 +1410,8 @@ void macvlan_dellink(struct net_device *dev, struct list_head *head) ...@@ -1408,7 +1410,8 @@ void macvlan_dellink(struct net_device *dev, struct list_head *head)
EXPORT_SYMBOL_GPL(macvlan_dellink); EXPORT_SYMBOL_GPL(macvlan_dellink);
static int macvlan_changelink(struct net_device *dev, static int macvlan_changelink(struct net_device *dev,
struct nlattr *tb[], struct nlattr *data[]) struct nlattr *tb[], struct nlattr *data[],
struct netlink_ext_ack *extack)
{ {
struct macvlan_dev *vlan = netdev_priv(dev); struct macvlan_dev *vlan = netdev_priv(dev);
enum macvlan_mode mode; enum macvlan_mode mode;
......
drivers/net/macvtap.c
View file @ d1f271d6
...@@ -77,10 +77,9 @@ static void macvtap_update_features(struct tap_dev *tap, ...@@ -77,10 +77,9 @@ static void macvtap_update_features(struct tap_dev *tap,
netdev_update_features(vlan->dev); netdev_update_features(vlan->dev);
} }
static int macvtap_newlink(struct net *src_net, static int macvtap_newlink(struct net *src_net, struct net_device *dev,
struct net_device *dev, struct nlattr *tb[], struct nlattr *data[],
struct nlattr *tb[], struct netlink_ext_ack *extack)
struct nlattr *data[])
{ {
struct macvtap_dev *vlantap = netdev_priv(dev); struct macvtap_dev *vlantap = netdev_priv(dev);
int err; int err;
......
drivers/net/nlmon.c
View file @ d1f271d6
...@@ -127,7 +127,8 @@ static void nlmon_setup(struct net_device *dev) ...@@ -127,7 +127,8 @@ static void nlmon_setup(struct net_device *dev)
dev->min_mtu = sizeof(struct nlmsghdr); dev->min_mtu = sizeof(struct nlmsghdr);
} }
static int nlmon_validate(struct nlattr *tb[], struct nlattr *data[]) static int nlmon_validate(struct nlattr *tb[], struct nlattr *data[],
struct netlink_ext_ack *extack)
{ {
if (tb[IFLA_ADDRESS]) if (tb[IFLA_ADDRESS])
return -EINVAL; return -EINVAL;
......
drivers/net/ppp/ppp_generic.c
View file @ d1f271d6
...@@ -1061,7 +1061,8 @@ static const struct nla_policy ppp_nl_policy[IFLA_PPP_MAX + 1] = { ...@@ -1061,7 +1061,8 @@ static const struct nla_policy ppp_nl_policy[IFLA_PPP_MAX + 1] = {
[IFLA_PPP_DEV_FD] = { .type = NLA_S32 }, [IFLA_PPP_DEV_FD] = { .type = NLA_S32 },
}; };
static int ppp_nl_validate(struct nlattr *tb[], struct nlattr *data[]) static int ppp_nl_validate(struct nlattr *tb[], struct nlattr *data[],
struct netlink_ext_ack *extack)
{ {
if (!data) if (!data)
return -EINVAL; return -EINVAL;
...@@ -1075,7 +1076,8 @@ static int ppp_nl_validate(struct nlattr *tb[], struct nlattr *data[]) ...@@ -1075,7 +1076,8 @@ static int ppp_nl_validate(struct nlattr *tb[], struct nlattr *data[])
} }
static int ppp_nl_newlink(struct net *src_net, struct net_device *dev, static int ppp_nl_newlink(struct net *src_net, struct net_device *dev,
struct nlattr *tb[], struct nlattr *data[]) struct nlattr *tb[], struct nlattr *data[],
struct netlink_ext_ack *extack)
{ {
struct ppp_config conf = { struct ppp_config conf = {
.unit = -1, .unit = -1,
......
drivers/net/team/team.c
View file @ d1f271d6
...@@ -2101,7 +2101,8 @@ static void team_setup(struct net_device *dev) ...@@ -2101,7 +2101,8 @@ static void team_setup(struct net_device *dev)
} }
static int team_newlink(struct net *src_net, struct net_device *dev, static int team_newlink(struct net *src_net, struct net_device *dev,
struct nlattr *tb[], struct nlattr *data[]) struct nlattr *tb[], struct nlattr *data[],
struct netlink_ext_ack *extack)
{ {
if (tb[IFLA_ADDRESS] == NULL) if (tb[IFLA_ADDRESS] == NULL)
eth_hw_addr_random(dev); eth_hw_addr_random(dev);
...@@ -2109,7 +2110,8 @@ static int team_newlink(struct net *src_net, struct net_device *dev, ...@@ -2109,7 +2110,8 @@ static int team_newlink(struct net *src_net, struct net_device *dev,
return register_netdevice(dev); return register_netdevice(dev);
} }
static int team_validate(struct nlattr *tb[], struct nlattr *data[]) static int team_validate(struct nlattr *tb[], struct nlattr *data[],
struct netlink_ext_ack *extack)
{ {
if (tb[IFLA_ADDRESS]) { if (tb[IFLA_ADDRESS]) {
if (nla_len(tb[IFLA_ADDRESS]) != ETH_ALEN) if (nla_len(tb[IFLA_ADDRESS]) != ETH_ALEN)
......
drivers/net/tun.c
View file @ d1f271d6
...@@ -1580,7 +1580,8 @@ static void tun_setup(struct net_device *dev) ...@@ -1580,7 +1580,8 @@ static void tun_setup(struct net_device *dev)
/* Trivial set of netlink ops to allow deleting tun or tap /* Trivial set of netlink ops to allow deleting tun or tap
* device with netlink. * device with netlink.
*/ */
static int tun_validate(struct nlattr *tb[], struct nlattr *data[]) static int tun_validate(struct nlattr *tb[], struct nlattr *data[],
struct netlink_ext_ack *extack)
{ {
return -EINVAL; return -EINVAL;
} }
......
drivers/net/veth.c
View file @ d1f271d6
...@@ -329,7 +329,8 @@ static void veth_setup(struct net_device *dev) ...@@ -329,7 +329,8 @@ static void veth_setup(struct net_device *dev)
* netlink interface * netlink interface
*/ */
static int veth_validate(struct nlattr *tb[], struct nlattr *data[]) static int veth_validate(struct nlattr *tb[], struct nlattr *data[],
struct netlink_ext_ack *extack)
{ {
if (tb[IFLA_ADDRESS]) { if (tb[IFLA_ADDRESS]) {
if (nla_len(tb[IFLA_ADDRESS]) != ETH_ALEN) if (nla_len(tb[IFLA_ADDRESS]) != ETH_ALEN)
...@@ -347,7 +348,8 @@ static int veth_validate(struct nlattr *tb[], struct nlattr *data[]) ...@@ -347,7 +348,8 @@ static int veth_validate(struct nlattr *tb[], struct nlattr *data[])
static struct rtnl_link_ops veth_link_ops; static struct rtnl_link_ops veth_link_ops;
static int veth_newlink(struct net *src_net, struct net_device *dev, static int veth_newlink(struct net *src_net, struct net_device *dev,
struct nlattr *tb[], struct nlattr *data[]) struct nlattr *tb[], struct nlattr *data[],
struct netlink_ext_ack *extack)
{ {
int err; int err;
struct net_device *peer; struct net_device *peer;
...@@ -373,7 +375,7 @@ static int veth_newlink(struct net *src_net, struct net_device *dev, ...@@ -373,7 +375,7 @@ static int veth_newlink(struct net *src_net, struct net_device *dev,
if (err < 0) if (err < 0)
return err; return err;
err = veth_validate(peer_tb, NULL); err = veth_validate(peer_tb, NULL, extack);
if (err < 0) if (err < 0)
return err; return err;
......
drivers/net/vrf.c
View file @ d1f271d6
...@@ -1372,7 +1372,8 @@ static void vrf_setup(struct net_device *dev) ...@@ -1372,7 +1372,8 @@ static void vrf_setup(struct net_device *dev)
dev->priv_flags |= IFF_NO_QUEUE; dev->priv_flags |= IFF_NO_QUEUE;
} }
static int vrf_validate(struct nlattr *tb[], struct nlattr *data[]) static int vrf_validate(struct nlattr *tb[], struct nlattr *data[],
struct netlink_ext_ack *extack)
{ {
if (tb[IFLA_ADDRESS]) { if (tb[IFLA_ADDRESS]) {
if (nla_len(tb[IFLA_ADDRESS]) != ETH_ALEN) if (nla_len(tb[IFLA_ADDRESS]) != ETH_ALEN)
...@@ -1389,7 +1390,8 @@ static void vrf_dellink(struct net_device *dev, struct list_head *head) ...@@ -1389,7 +1390,8 @@ static void vrf_dellink(struct net_device *dev, struct list_head *head)
} }
static int vrf_newlink(struct net *src_net, struct net_device *dev, static int vrf_newlink(struct net *src_net, struct net_device *dev,
struct nlattr *tb[], struct nlattr *data[]) struct nlattr *tb[], struct nlattr *data[],
struct netlink_ext_ack *extack)
{ {
struct net_vrf *vrf = netdev_priv(dev); struct net_vrf *vrf = netdev_priv(dev);
bool *add_fib_rules; bool *add_fib_rules;
......
drivers/net/vxlan.c
View file @ d1f271d6
...@@ -2711,7 +2711,8 @@ static const struct nla_policy vxlan_policy[IFLA_VXLAN_MAX + 1] = { ...@@ -2711,7 +2711,8 @@ static const struct nla_policy vxlan_policy[IFLA_VXLAN_MAX + 1] = {
[IFLA_VXLAN_REMCSUM_NOPARTIAL] = { .type = NLA_FLAG }, [IFLA_VXLAN_REMCSUM_NOPARTIAL] = { .type = NLA_FLAG },
}; };
static int vxlan_validate(struct nlattr *tb[], struct nlattr *data[]) static int vxlan_validate(struct nlattr *tb[], struct nlattr *data[],
struct netlink_ext_ack *extack)
{ {
if (tb[IFLA_ADDRESS]) { if (tb[IFLA_ADDRESS]) {
if (nla_len(tb[IFLA_ADDRESS]) != ETH_ALEN) { if (nla_len(tb[IFLA_ADDRESS]) != ETH_ALEN) {
...@@ -3333,7 +3334,8 @@ static int vxlan_nl2conf(struct nlattr *tb[], struct nlattr *data[], ...@@ -3333,7 +3334,8 @@ static int vxlan_nl2conf(struct nlattr *tb[], struct nlattr *data[],
} }
static int vxlan_newlink(struct net *src_net, struct net_device *dev, static int vxlan_newlink(struct net *src_net, struct net_device *dev,
struct nlattr *tb[], struct nlattr *data[]) struct nlattr *tb[], struct nlattr *data[],
struct netlink_ext_ack *extack)
{ {
struct vxlan_config conf; struct vxlan_config conf;
int err; int err;
...@@ -3346,7 +3348,8 @@ static int vxlan_newlink(struct net *src_net, struct net_device *dev, ...@@ -3346,7 +3348,8 @@ static int vxlan_newlink(struct net *src_net, struct net_device *dev,
} }
static int vxlan_changelink(struct net_device *dev, struct nlattr *tb[], static int vxlan_changelink(struct net_device *dev, struct nlattr *tb[],
struct nlattr *data[]) struct nlattr *data[],
struct netlink_ext_ack *extack)
{ {
struct vxlan_dev *vxlan = netdev_priv(dev); struct vxlan_dev *vxlan = netdev_priv(dev);
struct vxlan_rdst *dst = &vxlan->default_dst; struct vxlan_rdst *dst = &vxlan->default_dst;
......
include/net/rtnetlink.h
View file @ d1f271d6
...@@ -63,15 +63,18 @@ struct rtnl_link_ops { ...@@ -63,15 +63,18 @@ struct rtnl_link_ops {
int maxtype; int maxtype;
const struct nla_policy *policy; const struct nla_policy *policy;
int (*validate)(struct nlattr *tb[], int (*validate)(struct nlattr *tb[],
struct nlattr *data[]); struct nlattr *data[],
struct netlink_ext_ack *extack);
int (*newlink)(struct net *src_net, int (*newlink)(struct net *src_net,
struct net_device *dev, struct net_device *dev,
struct nlattr *tb[], struct nlattr *tb[],
struct nlattr *data[]); struct nlattr *data[],
struct netlink_ext_ack *extack);
int (*changelink)(struct net_device *dev, int (*changelink)(struct net_device *dev,
struct nlattr *tb[], struct nlattr *tb[],
struct nlattr *data[]); struct nlattr *data[],
struct netlink_ext_ack *extack);
void (*dellink)(struct net_device *dev, void (*dellink)(struct net_device *dev,
struct list_head *head); struct list_head *head);
...@@ -88,11 +91,13 @@ struct rtnl_link_ops { ...@@ -88,11 +91,13 @@ struct rtnl_link_ops {
int slave_maxtype; int slave_maxtype;
const struct nla_policy *slave_policy; const struct nla_policy *slave_policy;
int (*slave_validate)(struct nlattr *tb[], int (*slave_validate)(struct nlattr *tb[],
struct nlattr *data[]); struct nlattr *data[],
struct netlink_ext_ack *extack);
int (*slave_changelink)(struct net_device *dev, int (*slave_changelink)(struct net_device *dev,
struct net_device *slave_dev, struct net_device *slave_dev,
struct nlattr *tb[], struct nlattr *tb[],
struct nlattr *data[]); struct nlattr *data[],
struct netlink_ext_ack *extack);
size_t (*get_slave_size)(const struct net_device *dev, size_t (*get_slave_size)(const struct net_device *dev,
const struct net_device *slave_dev); const struct net_device *slave_dev);
int (*fill_slave_info)(struct sk_buff *skb, int (*fill_slave_info)(struct sk_buff *skb,
......
net/8021q/vlan_netlink.c
View file @ d1f271d6
...@@ -39,7 +39,8 @@ static inline int vlan_validate_qos_map(struct nlattr *attr) ...@@ -39,7 +39,8 @@ static inline int vlan_validate_qos_map(struct nlattr *attr)
NULL); NULL);
} }
static int vlan_validate(struct nlattr *tb[], struct nlattr *data[]) static int vlan_validate(struct nlattr *tb[], struct nlattr *data[],
struct netlink_ext_ack *extack)
{ {
struct ifla_vlan_flags *flags; struct ifla_vlan_flags *flags;
u16 id; u16 id;
...@@ -87,8 +88,9 @@ static int vlan_validate(struct nlattr *tb[], struct nlattr *data[]) ...@@ -87,8 +88,9 @@ static int vlan_validate(struct nlattr *tb[], struct nlattr *data[])
return 0; return 0;
} }
static int vlan_changelink(struct net_device *dev, static int vlan_changelink(struct net_device *dev, struct nlattr *tb[],
struct nlattr *tb[], struct nlattr *data[]) struct nlattr *data[],
struct netlink_ext_ack *extack)
{ {
struct ifla_vlan_flags *flags; struct ifla_vlan_flags *flags;
struct ifla_vlan_qos_mapping *m; struct ifla_vlan_qos_mapping *m;
...@@ -115,7 +117,8 @@ static int vlan_changelink(struct net_device *dev, ...@@ -115,7 +117,8 @@ static int vlan_changelink(struct net_device *dev,
} }
static int vlan_newlink(struct net *src_net, struct net_device *dev, static int vlan_newlink(struct net *src_net, struct net_device *dev,
struct nlattr *tb[], struct nlattr *data[]) struct nlattr *tb[], struct nlattr *data[],
struct netlink_ext_ack *extack)
{ {
struct vlan_dev_priv *vlan = vlan_dev_priv(dev); struct vlan_dev_priv *vlan = vlan_dev_priv(dev);
struct net_device *real_dev; struct net_device *real_dev;
...@@ -153,7 +156,7 @@ static int vlan_newlink(struct net *src_net, struct net_device *dev, ...@@ -153,7 +156,7 @@ static int vlan_newlink(struct net *src_net, struct net_device *dev,
else if (dev->mtu > max_mtu) else if (dev->mtu > max_mtu)
return -EINVAL; return -EINVAL;
err = vlan_changelink(dev, tb, data); err = vlan_changelink(dev, tb, data, extack);
if (err < 0) if (err < 0)
return err; return err;
......
net/bridge/br_netlink.c
View file @ d1f271d6
...@@ -858,7 +858,9 @@ int br_dellink(struct net_device *dev, struct nlmsghdr *nlh, u16 flags) ...@@ -858,7 +858,9 @@ int br_dellink(struct net_device *dev, struct nlmsghdr *nlh, u16 flags)
return err; return err;
} }
static int br_validate(struct nlattr *tb[], struct nlattr *data[])
static int br_validate(struct nlattr *tb[], struct nlattr *data[],
struct netlink_ext_ack *extack)
{ {
if (tb[IFLA_ADDRESS]) { if (tb[IFLA_ADDRESS]) {
if (nla_len(tb[IFLA_ADDRESS]) != ETH_ALEN) if (nla_len(tb[IFLA_ADDRESS]) != ETH_ALEN)
...@@ -895,7 +897,8 @@ static int br_validate(struct nlattr *tb[], struct nlattr *data[]) ...@@ -895,7 +897,8 @@ static int br_validate(struct nlattr *tb[], struct nlattr *data[])
static int br_port_slave_changelink(struct net_device *brdev, static int br_port_slave_changelink(struct net_device *brdev,
struct net_device *dev, struct net_device *dev,
struct nlattr *tb[], struct nlattr *tb[],
struct nlattr *data[]) struct nlattr *data[],
struct netlink_ext_ack *extack)
{ {
struct net_bridge *br = netdev_priv(brdev); struct net_bridge *br = netdev_priv(brdev);
int ret; int ret;
...@@ -960,7 +963,8 @@ static const struct nla_policy br_policy[IFLA_BR_MAX + 1] = { ...@@ -960,7 +963,8 @@ static const struct nla_policy br_policy[IFLA_BR_MAX + 1] = {
}; };
static int br_changelink(struct net_device *brdev, struct nlattr *tb[], static int br_changelink(struct net_device *brdev, struct nlattr *tb[],
struct nlattr *data[]) struct nlattr *data[],
struct netlink_ext_ack *extack)
{ {
struct net_bridge *br = netdev_priv(brdev); struct net_bridge *br = netdev_priv(brdev);
int err; int err;
...@@ -1213,7 +1217,8 @@ static int br_changelink(struct net_device *brdev, struct nlattr *tb[], ...@@ -1213,7 +1217,8 @@ static int br_changelink(struct net_device *brdev, struct nlattr *tb[],
} }
static int br_dev_newlink(struct net *src_net, struct net_device *dev, static int br_dev_newlink(struct net *src_net, struct net_device *dev,
struct nlattr *tb[], struct nlattr *data[]) struct nlattr *tb[], struct nlattr *data[],
struct netlink_ext_ack *extack)
{ {
struct net_bridge *br = netdev_priv(dev); struct net_bridge *br = netdev_priv(dev);
int err; int err;
...@@ -1228,7 +1233,7 @@ static int br_dev_newlink(struct net *src_net, struct net_device *dev, ...@@ -1228,7 +1233,7 @@ static int br_dev_newlink(struct net *src_net, struct net_device *dev,
if (err) if (err)
return err; return err;
err = br_changelink(dev, tb, data); err = br_changelink(dev, tb, data, extack);
if (err) if (err)
unregister_netdevice(dev); unregister_netdevice(dev);
return err; return err;
......
net/caif/chnl_net.c
View file @ d1f271d6
...@@ -461,7 +461,8 @@ static void caif_netlink_parms(struct nlattr *data[], ...@@ -461,7 +461,8 @@ static void caif_netlink_parms(struct nlattr *data[],
} }
static int ipcaif_newlink(struct net *src_net, struct net_device *dev, static int ipcaif_newlink(struct net *src_net, struct net_device *dev,
struct nlattr *tb[], struct nlattr *data[]) struct nlattr *tb[], struct nlattr *data[],
struct netlink_ext_ack *extack)
{ {
int ret; int ret;
struct chnl_net *caifdev; struct chnl_net *caifdev;
...@@ -484,7 +485,8 @@ static int ipcaif_newlink(struct net *src_net, struct net_device *dev, ...@@ -484,7 +485,8 @@ static int ipcaif_newlink(struct net *src_net, struct net_device *dev,
} }
static int ipcaif_changelink(struct net_device *dev, struct nlattr *tb[], static int ipcaif_changelink(struct net_device *dev, struct nlattr *tb[],
struct nlattr *data[]) struct nlattr *data[],
struct netlink_ext_ack *extack)
{ {
struct chnl_net *caifdev; struct chnl_net *caifdev;
ASSERT_RTNL(); ASSERT_RTNL();
......
net/core/rtnetlink.c
View file @ d1f271d6
...@@ -2582,7 +2582,7 @@ static int rtnl_newlink(struct sk_buff *skb, struct nlmsghdr *nlh, ...@@ -2582,7 +2582,7 @@ static int rtnl_newlink(struct sk_buff *skb, struct nlmsghdr *nlh,
data = attr; data = attr;
} }
if (ops->validate) { if (ops->validate) {
err = ops->validate(tb, data); err = ops->validate(tb, data, extack);
if (err < 0) if (err < 0)
return err; return err;
} }
...@@ -2601,7 +2601,8 @@ static int rtnl_newlink(struct sk_buff *skb, struct nlmsghdr *nlh, ...@@ -2601,7 +2601,8 @@ static int rtnl_newlink(struct sk_buff *skb, struct nlmsghdr *nlh,
slave_data = slave_attr; slave_data = slave_attr;
} }
if (m_ops->slave_validate) { if (m_ops->slave_validate) {
err = m_ops->slave_validate(tb, slave_data); err = m_ops->slave_validate(tb, slave_data,
extack);
if (err < 0) if (err < 0)
return err; return err;
} }
...@@ -2620,7 +2621,7 @@ static int rtnl_newlink(struct sk_buff *skb, struct nlmsghdr *nlh, ...@@ -2620,7 +2621,7 @@ static int rtnl_newlink(struct sk_buff *skb, struct nlmsghdr *nlh,
!ops->changelink) !ops->changelink)
return -EOPNOTSUPP; return -EOPNOTSUPP;
err = ops->changelink(dev, tb, data); err = ops->changelink(dev, tb, data, extack);
if (err < 0) if (err < 0)
return err; return err;
status |= DO_SETLINK_NOTIFY; status |= DO_SETLINK_NOTIFY;
...@@ -2631,7 +2632,8 @@ static int rtnl_newlink(struct sk_buff *skb, struct nlmsghdr *nlh, ...@@ -2631,7 +2632,8 @@ static int rtnl_newlink(struct sk_buff *skb, struct nlmsghdr *nlh,
return -EOPNOTSUPP; return -EOPNOTSUPP;
err = m_ops->slave_changelink(master_dev, dev, err = m_ops->slave_changelink(master_dev, dev,
tb, slave_data); tb, slave_data,
extack);
if (err < 0) if (err < 0)
return err; return err;
status |= DO_SETLINK_NOTIFY; status |= DO_SETLINK_NOTIFY;
...@@ -2705,7 +2707,8 @@ static int rtnl_newlink(struct sk_buff *skb, struct nlmsghdr *nlh, ...@@ -2705,7 +2707,8 @@ static int rtnl_newlink(struct sk_buff *skb, struct nlmsghdr *nlh,
dev->ifindex = ifm->ifi_index; dev->ifindex = ifm->ifi_index;
if (ops->newlink) { if (ops->newlink) {
err = ops->newlink(link_net ? : net, dev, tb, data); err = ops->newlink(link_net ? : net, dev, tb, data,
extack);
/* Drivers should call free_netdev() in ->destructor /* Drivers should call free_netdev() in ->destructor
* and unregister it on failure after registration * and unregister it on failure after registration
* so that device could be finally freed in rtnl_unlock. * so that device could be finally freed in rtnl_unlock.
......
net/hsr/hsr_netlink.c
View file @ d1f271d6
...@@ -33,7 +33,8 @@ static const struct nla_policy hsr_policy[IFLA_HSR_MAX + 1] = { ...@@ -33,7 +33,8 @@ static const struct nla_policy hsr_policy[IFLA_HSR_MAX + 1] = {
* hsr_dev_setup routine has been executed. Nice! * hsr_dev_setup routine has been executed. Nice!
*/ */
static int hsr_newlink(struct net *src_net, struct net_device *dev, static int hsr_newlink(struct net *src_net, struct net_device *dev,
struct nlattr *tb[], struct nlattr *data[]) struct nlattr *tb[], struct nlattr *data[],
struct netlink_ext_ack *extack)
{ {
struct net_device *link[2]; struct net_device *link[2];
unsigned char multicast_spec, hsr_version; unsigned char multicast_spec, hsr_version;
......
net/ieee802154/6lowpan/core.c
View file @ d1f271d6
...@@ -111,7 +111,8 @@ static void lowpan_setup(struct net_device *ldev) ...@@ -111,7 +111,8 @@ static void lowpan_setup(struct net_device *ldev)
ldev->features |= NETIF_F_NETNS_LOCAL; ldev->features |= NETIF_F_NETNS_LOCAL;
} }
static int lowpan_validate(struct nlattr *tb[], struct nlattr *data[]) static int lowpan_validate(struct nlattr *tb[], struct nlattr *data[],
struct netlink_ext_ack *extack)
{ {
if (tb[IFLA_ADDRESS]) { if (tb[IFLA_ADDRESS]) {
if (nla_len(tb[IFLA_ADDRESS]) != IEEE802154_ADDR_LEN) if (nla_len(tb[IFLA_ADDRESS]) != IEEE802154_ADDR_LEN)
...@@ -121,7 +122,8 @@ static int lowpan_validate(struct nlattr *tb[], struct nlattr *data[]) ...@@ -121,7 +122,8 @@ static int lowpan_validate(struct nlattr *tb[], struct nlattr *data[])
} }
static int lowpan_newlink(struct net *src_net, struct net_device *ldev, static int lowpan_newlink(struct net *src_net, struct net_device *ldev,
struct nlattr *tb[], struct nlattr *data[]) struct nlattr *tb[], struct nlattr *data[],
struct netlink_ext_ack *extack)
{ {
struct net_device *wdev; struct net_device *wdev;
int ret; int ret;
......
net/ipv4/ip_gre.c
View file @ d1f271d6
...@@ -779,7 +779,8 @@ static struct pernet_operations ipgre_net_ops = { ...@@ -779,7 +779,8 @@ static struct pernet_operations ipgre_net_ops = {
.size = sizeof(struct ip_tunnel_net), .size = sizeof(struct ip_tunnel_net),
}; };
static int ipgre_tunnel_validate(struct nlattr *tb[], struct nlattr *data[]) static int ipgre_tunnel_validate(struct nlattr *tb[], struct nlattr *data[],
struct netlink_ext_ack *extack)
{ {
__be16 flags; __be16 flags;
...@@ -802,7 +803,8 @@ static int ipgre_tunnel_validate(struct nlattr *tb[], struct nlattr *data[]) ...@@ -802,7 +803,8 @@ static int ipgre_tunnel_validate(struct nlattr *tb[], struct nlattr *data[])
return 0; return 0;
} }
static int ipgre_tap_validate(struct nlattr *tb[], struct nlattr *data[]) static int ipgre_tap_validate(struct nlattr *tb[], struct nlattr *data[],
struct netlink_ext_ack *extack)
{ {
__be32 daddr; __be32 daddr;
...@@ -823,7 +825,7 @@ static int ipgre_tap_validate(struct nlattr *tb[], struct nlattr *data[]) ...@@ -823,7 +825,7 @@ static int ipgre_tap_validate(struct nlattr *tb[], struct nlattr *data[])
} }
out: out:
return ipgre_tunnel_validate(tb, data); return ipgre_tunnel_validate(tb, data, extack);
} }
static int ipgre_netlink_parms(struct net_device *dev, static int ipgre_netlink_parms(struct net_device *dev,
...@@ -957,7 +959,8 @@ static void ipgre_tap_setup(struct net_device *dev) ...@@ -957,7 +959,8 @@ static void ipgre_tap_setup(struct net_device *dev)
} }
static int ipgre_newlink(struct net *src_net, struct net_device *dev, static int ipgre_newlink(struct net *src_net, struct net_device *dev,
struct nlattr *tb[], struct nlattr *data[]) struct nlattr *tb[], struct nlattr *data[],
struct netlink_ext_ack *extack)
{ {
struct ip_tunnel_parm p; struct ip_tunnel_parm p;
struct ip_tunnel_encap ipencap; struct ip_tunnel_encap ipencap;
...@@ -979,7 +982,8 @@ static int ipgre_newlink(struct net *src_net, struct net_device *dev, ...@@ -979,7 +982,8 @@ static int ipgre_newlink(struct net *src_net, struct net_device *dev,
} }
static int ipgre_changelink(struct net_device *dev, struct nlattr *tb[], static int ipgre_changelink(struct net_device *dev, struct nlattr *tb[],
struct nlattr *data[]) struct nlattr *data[],
struct netlink_ext_ack *extack)
{ {
struct ip_tunnel *t = netdev_priv(dev); struct ip_tunnel *t = netdev_priv(dev);
struct ip_tunnel_parm p; struct ip_tunnel_parm p;
...@@ -1155,7 +1159,7 @@ struct net_device *gretap_fb_dev_create(struct net *net, const char *name, ...@@ -1155,7 +1159,7 @@ struct net_device *gretap_fb_dev_create(struct net *net, const char *name,
t = netdev_priv(dev); t = netdev_priv(dev);
t->collect_md = true; t->collect_md = true;
err = ipgre_newlink(net, dev, tb, NULL); err = ipgre_newlink(net, dev, tb, NULL, NULL);
if (err < 0) { if (err < 0) {
free_netdev(dev); free_netdev(dev);
return ERR_PTR(err); return ERR_PTR(err);
......
net/ipv4/ip_vti.c
View file @ d1f271d6
...@@ -465,7 +465,8 @@ static struct pernet_operations vti_net_ops = { ...@@ -465,7 +465,8 @@ static struct pernet_operations vti_net_ops = {
.size = sizeof(struct ip_tunnel_net), .size = sizeof(struct ip_tunnel_net),
}; };
static int vti_tunnel_validate(struct nlattr *tb[], struct nlattr *data[]) static int vti_tunnel_validate(struct nlattr *tb[], struct nlattr *data[],
struct netlink_ext_ack *extack)
{ {
return 0; return 0;
} }
...@@ -503,7 +504,8 @@ static void vti_netlink_parms(struct nlattr *data[], ...@@ -503,7 +504,8 @@ static void vti_netlink_parms(struct nlattr *data[],
} }
static int vti_newlink(struct net *src_net, struct net_device *dev, static int vti_newlink(struct net *src_net, struct net_device *dev,
struct nlattr *tb[], struct nlattr *data[]) struct nlattr *tb[], struct nlattr *data[],
struct netlink_ext_ack *extack)
{ {
struct ip_tunnel_parm parms; struct ip_tunnel_parm parms;
__u32 fwmark = 0; __u32 fwmark = 0;
...@@ -513,7 +515,8 @@ static int vti_newlink(struct net *src_net, struct net_device *dev, ...@@ -513,7 +515,8 @@ static int vti_newlink(struct net *src_net, struct net_device *dev,
} }
static int vti_changelink(struct net_device *dev, struct nlattr *tb[], static int vti_changelink(struct net_device *dev, struct nlattr *tb[],
struct nlattr *data[]) struct nlattr *data[],
struct netlink_ext_ack *extack)
{ {
struct ip_tunnel *t = netdev_priv(dev); struct ip_tunnel *t = netdev_priv(dev);
__u32 fwmark = t->fwmark; __u32 fwmark = t->fwmark;
......
net/ipv4/ipip.c
View file @ d1f271d6
...@@ -375,7 +375,8 @@ static int ipip_tunnel_init(struct net_device *dev) ...@@ -375,7 +375,8 @@ static int ipip_tunnel_init(struct net_device *dev)
return ip_tunnel_init(dev); return ip_tunnel_init(dev);
} }
static int ipip_tunnel_validate(struct nlattr *tb[], struct nlattr *data[]) static int ipip_tunnel_validate(struct nlattr *tb[], struct nlattr *data[],
struct netlink_ext_ack *extack)
{ {
u8 proto; u8 proto;
...@@ -469,7 +470,8 @@ static bool ipip_netlink_encap_parms(struct nlattr *data[], ...@@ -469,7 +470,8 @@ static bool ipip_netlink_encap_parms(struct nlattr *data[],
} }
static int ipip_newlink(struct net *src_net, struct net_device *dev, static int ipip_newlink(struct net *src_net, struct net_device *dev,
struct nlattr *tb[], struct nlattr *data[]) struct nlattr *tb[], struct nlattr *data[],
struct netlink_ext_ack *extack)
{ {
struct ip_tunnel *t = netdev_priv(dev); struct ip_tunnel *t = netdev_priv(dev);
struct ip_tunnel_parm p; struct ip_tunnel_parm p;
...@@ -488,7 +490,8 @@ static int ipip_newlink(struct net *src_net, struct net_device *dev, ...@@ -488,7 +490,8 @@ static int ipip_newlink(struct net *src_net, struct net_device *dev,
} }
static int ipip_changelink(struct net_device *dev, struct nlattr *tb[], static int ipip_changelink(struct net_device *dev, struct nlattr *tb[],
struct nlattr *data[]) struct nlattr *data[],
struct netlink_ext_ack *extack)
{ {
struct ip_tunnel *t = netdev_priv(dev); struct ip_tunnel *t = netdev_priv(dev);
struct ip_tunnel_parm p; struct ip_tunnel_parm p;
......
net/ipv6/ip6_gre.c
View file @ d1f271d6
...@@ -1170,7 +1170,8 @@ static struct pernet_operations ip6gre_net_ops = { ...@@ -1170,7 +1170,8 @@ static struct pernet_operations ip6gre_net_ops = {
.size = sizeof(struct ip6gre_net), .size = sizeof(struct ip6gre_net),
}; };
static int ip6gre_tunnel_validate(struct nlattr *tb[], struct nlattr *data[]) static int ip6gre_tunnel_validate(struct nlattr *tb[], struct nlattr *data[],
struct netlink_ext_ack *extack)
{ {
__be16 flags; __be16 flags;
...@@ -1188,7 +1189,8 @@ static int ip6gre_tunnel_validate(struct nlattr *tb[], struct nlattr *data[]) ...@@ -1188,7 +1189,8 @@ static int ip6gre_tunnel_validate(struct nlattr *tb[], struct nlattr *data[])
return 0; return 0;
} }
static int ip6gre_tap_validate(struct nlattr *tb[], struct nlattr *data[]) static int ip6gre_tap_validate(struct nlattr *tb[], struct nlattr *data[],
struct netlink_ext_ack *extack)
{ {
struct in6_addr daddr; struct in6_addr daddr;
...@@ -1209,7 +1211,7 @@ static int ip6gre_tap_validate(struct nlattr *tb[], struct nlattr *data[]) ...@@ -1209,7 +1211,7 @@ static int ip6gre_tap_validate(struct nlattr *tb[], struct nlattr *data[])
} }
out: out:
return ip6gre_tunnel_validate(tb, data); return ip6gre_tunnel_validate(tb, data, extack);
} }
...@@ -1342,7 +1344,8 @@ static bool ip6gre_netlink_encap_parms(struct nlattr *data[], ...@@ -1342,7 +1344,8 @@ static bool ip6gre_netlink_encap_parms(struct nlattr *data[],
} }
static int ip6gre_newlink(struct net *src_net, struct net_device *dev, static int ip6gre_newlink(struct net *src_net, struct net_device *dev,
struct nlattr *tb[], struct nlattr *data[]) struct nlattr *tb[], struct nlattr *data[],
struct netlink_ext_ack *extack)
{ {
struct ip6_tnl *nt; struct ip6_tnl *nt;
struct net *net = dev_net(dev); struct net *net = dev_net(dev);
...@@ -1403,7 +1406,8 @@ static int ip6gre_newlink(struct net *src_net, struct net_device *dev, ...@@ -1403,7 +1406,8 @@ static int ip6gre_newlink(struct net *src_net, struct net_device *dev,
} }
static int ip6gre_changelink(struct net_device *dev, struct nlattr *tb[], static int ip6gre_changelink(struct net_device *dev, struct nlattr *tb[],
struct nlattr *data[]) struct nlattr *data[],
struct netlink_ext_ack *extack)
{ {
struct ip6_tnl *t, *nt = netdev_priv(dev); struct ip6_tnl *t, *nt = netdev_priv(dev);
struct net *net = nt->net; struct net *net = nt->net;
......
net/ipv6/ip6_tunnel.c
View file @ d1f271d6
...@@ -1885,7 +1885,8 @@ static int __net_init ip6_fb_tnl_dev_init(struct net_device *dev) ...@@ -1885,7 +1885,8 @@ static int __net_init ip6_fb_tnl_dev_init(struct net_device *dev)
return 0; return 0;
} }
static int ip6_tnl_validate(struct nlattr *tb[], struct nlattr *data[]) static int ip6_tnl_validate(struct nlattr *tb[], struct nlattr *data[],
struct netlink_ext_ack *extack)
{ {
u8 proto; u8 proto;
...@@ -1974,7 +1975,8 @@ static bool ip6_tnl_netlink_encap_parms(struct nlattr *data[], ...@@ -1974,7 +1975,8 @@ static bool ip6_tnl_netlink_encap_parms(struct nlattr *data[],
} }
static int ip6_tnl_newlink(struct net *src_net, struct net_device *dev, static int ip6_tnl_newlink(struct net *src_net, struct net_device *dev,
struct nlattr *tb[], struct nlattr *data[]) struct nlattr *tb[], struct nlattr *data[],
struct netlink_ext_ack *extack)
{ {
struct net *net = dev_net(dev); struct net *net = dev_net(dev);
struct ip6_tnl_net *ip6n = net_generic(net, ip6_tnl_net_id); struct ip6_tnl_net *ip6n = net_generic(net, ip6_tnl_net_id);
...@@ -2005,7 +2007,8 @@ static int ip6_tnl_newlink(struct net *src_net, struct net_device *dev, ...@@ -2005,7 +2007,8 @@ static int ip6_tnl_newlink(struct net *src_net, struct net_device *dev,
} }
static int ip6_tnl_changelink(struct net_device *dev, struct nlattr *tb[], static int ip6_tnl_changelink(struct net_device *dev, struct nlattr *tb[],
struct nlattr *data[]) struct nlattr *data[],
struct netlink_ext_ack *extack)
{ {
struct ip6_tnl *t = netdev_priv(dev); struct ip6_tnl *t = netdev_priv(dev);
struct __ip6_tnl_parm p; struct __ip6_tnl_parm p;
......
net/ipv6/ip6_vti.c
View file @ d1f271d6
...@@ -907,7 +907,8 @@ static int __net_init vti6_fb_tnl_dev_init(struct net_device *dev) ...@@ -907,7 +907,8 @@ static int __net_init vti6_fb_tnl_dev_init(struct net_device *dev)
return 0; return 0;
} }
static int vti6_validate(struct nlattr *tb[], struct nlattr *data[]) static int vti6_validate(struct nlattr *tb[], struct nlattr *data[],
struct netlink_ext_ack *extack)
{ {
return 0; return 0;
} }
...@@ -940,7 +941,8 @@ static void vti6_netlink_parms(struct nlattr *data[], ...@@ -940,7 +941,8 @@ static void vti6_netlink_parms(struct nlattr *data[],
} }
static int vti6_newlink(struct net *src_net, struct net_device *dev, static int vti6_newlink(struct net *src_net, struct net_device *dev,
struct nlattr *tb[], struct nlattr *data[]) struct nlattr *tb[], struct nlattr *data[],
struct netlink_ext_ack *extack)
{ {
struct net *net = dev_net(dev); struct net *net = dev_net(dev);
struct ip6_tnl *nt; struct ip6_tnl *nt;
...@@ -966,7 +968,8 @@ static void vti6_dellink(struct net_device *dev, struct list_head *head) ...@@ -966,7 +968,8 @@ static void vti6_dellink(struct net_device *dev, struct list_head *head)
} }
static int vti6_changelink(struct net_device *dev, struct nlattr *tb[], static int vti6_changelink(struct net_device *dev, struct nlattr *tb[],
struct nlattr *data[]) struct nlattr *data[],
struct netlink_ext_ack *extack)
{ {
struct ip6_tnl *t; struct ip6_tnl *t;
struct __ip6_tnl_parm p; struct __ip6_tnl_parm p;
......
net/ipv6/sit.c
View file @ d1f271d6
...@@ -1406,7 +1406,8 @@ static void __net_init ipip6_fb_tunnel_init(struct net_device *dev) ...@@ -1406,7 +1406,8 @@ static void __net_init ipip6_fb_tunnel_init(struct net_device *dev)
rcu_assign_pointer(sitn->tunnels_wc[0], tunnel); rcu_assign_pointer(sitn->tunnels_wc[0], tunnel);
} }
static int ipip6_validate(struct nlattr *tb[], struct nlattr *data[]) static int ipip6_validate(struct nlattr *tb[], struct nlattr *data[],
struct netlink_ext_ack *extack)
{ {
u8 proto; u8 proto;
...@@ -1537,7 +1538,8 @@ static bool ipip6_netlink_6rd_parms(struct nlattr *data[], ...@@ -1537,7 +1538,8 @@ static bool ipip6_netlink_6rd_parms(struct nlattr *data[],
#endif #endif
static int ipip6_newlink(struct net *src_net, struct net_device *dev, static int ipip6_newlink(struct net *src_net, struct net_device *dev,
struct nlattr *tb[], struct nlattr *data[]) struct nlattr *tb[], struct nlattr *data[],
struct netlink_ext_ack *extack)
{ {
struct net *net = dev_net(dev); struct net *net = dev_net(dev);
struct ip_tunnel *nt; struct ip_tunnel *nt;
...@@ -1573,7 +1575,8 @@ static int ipip6_newlink(struct net *src_net, struct net_device *dev, ...@@ -1573,7 +1575,8 @@ static int ipip6_newlink(struct net *src_net, struct net_device *dev,
} }
static int ipip6_changelink(struct net_device *dev, struct nlattr *tb[], static int ipip6_changelink(struct net_device *dev, struct nlattr *tb[],
struct nlattr *data[]) struct nlattr *data[],
struct netlink_ext_ack *extack)
{ {
struct ip_tunnel *t = netdev_priv(dev); struct ip_tunnel *t = netdev_priv(dev);
struct ip_tunnel_parm p; struct ip_tunnel_parm p;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7