redonkable
/
remarkable-linux
1
0
Fork 0
Code Releases Activity

net: add netlink_ext_ack argument to rtnl_link_ops.newlink 

Add support for extended error reporting.

Signed-off-by: Matthias Schiffer <mschiffer@universe-factory.net>
Acked-by: David Ahern <dsahern@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
zero-colors
Matthias Schiffer 2017-06-25 23:55:59 +02:00 committed by David S. Miller
parent dacdbb4dfc
commit 7a3f4a1851
32 changed files with 68 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/infiniband/ulp/ipoib/ipoib_netlink.c
View File

@ -93,7 +93,8 @@ out_err:
} }
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;

3
drivers/net/bonding/bond_netlink.c
View File

@ -438,7 +438,8 @@ 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;

3
drivers/net/caif/caif_hsi.c
View File

@ -1399,7 +1399,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);

3
drivers/net/can/dev.c
View File

@ -1146,7 +1146,8 @@ nla_put_failure:
} }
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;
} }

3
drivers/net/can/vxcan.c
View File

@ -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;

3
drivers/net/geneve.c
View File

@ -1181,7 +1181,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;

3
drivers/net/gtp.c
View File

@ -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;

3
drivers/net/ipvlan/ipvlan.h
View File

@ -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);

3
drivers/net/ipvlan/ipvlan_main.c
View File

@ -508,7 +508,8 @@ err:
} }
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;

9
drivers/net/ipvlan/ipvtap.c
View File

@ -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,
/* 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;

3
drivers/net/macsec.c
View File

@ -3203,7 +3203,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;

3
drivers/net/macvlan.c
View File

@ -1390,7 +1390,8 @@ destroy_macvlan_port:
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);
} }

7
drivers/net/macvtap.c
View File

@ -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;

3
drivers/net/ppp/ppp_generic.c
View File

@ -1075,7 +1075,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,

3
drivers/net/team/team.c
View File

@ -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);

3
drivers/net/veth.c
View File

@ -347,7 +347,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;

3
drivers/net/vrf.c
View File

@ -1389,7 +1389,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;

3
drivers/net/vxlan.c
View File

@ -3333,7 +3333,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;

3
include/net/rtnetlink.h
View File

@ -68,7 +68,8 @@ struct rtnl_link_ops {
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[]);

3
net/8021q/vlan_netlink.c
View File

@ -115,7 +115,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;

3
net/bridge/br_netlink.c
View File

@ -1213,7 +1213,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;

3
net/caif/chnl_net.c
View File

@ -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;

3
net/core/rtnetlink.c
View File

@ -2705,7 +2705,8 @@ replay:
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.

3
net/hsr/hsr_netlink.c
View File

@ -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;

3
net/ieee802154/6lowpan/core.c
View File

@ -121,7 +121,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;

5
net/ipv4/ip_gre.c
View File

@ -957,7 +957,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;
@ -1155,7 +1156,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);

3
net/ipv4/ip_vti.c
View File

@ -503,7 +503,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;

3
net/ipv4/ipip.c
View File

@ -469,7 +469,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;

3
net/ipv6/ip6_gre.c
View File

@ -1342,7 +1342,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);

3
net/ipv6/ip6_tunnel.c
View File

@ -1974,7 +1974,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);

3
net/ipv6/ip6_vti.c
View File

@ -940,7 +940,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;

3
net/ipv6/sit.c
View File

@ -1537,7 +1537,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;