Commit 95772ec9 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'net-More-extack-messages' 



David Ahern says:

====================
net: More extack messages

Add more extack messages for several link create errors (e.g., invalid
number of queues, unknown link kind) and invalid metrics argument.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 0b215b97 68d57f3b

drivers/net/can/vxcan.c

+1 −1
Original line number Diff line number Diff line
@@ -207,7 +207,7 @@ static int vxcan_newlink(struct net *net, struct net_device *dev, 
		return PTR_ERR(peer_net);



	peer = rtnl_create_link(peer_net, ifname, name_assign_type,

				&vxcan_link_ops, tbp);

				&vxcan_link_ops, tbp, extack);

	if (IS_ERR(peer)) {

		put_net(peer_net);

		return PTR_ERR(peer);

drivers/net/geneve.c

+1 −1
Original line number Diff line number Diff line
@@ -1666,7 +1666,7 @@ struct net_device *geneve_dev_create_fb(struct net *net, const char *name, 


	memset(tb, 0, sizeof(tb));

	dev = rtnl_create_link(net, name, name_assign_type,

			       &geneve_link_ops, tb);

			       &geneve_link_ops, tb, NULL);

	if (IS_ERR(dev))

		return dev;

drivers/net/veth.c

+1 −1
Original line number Diff line number Diff line
@@ -1253,7 +1253,7 @@ static int veth_newlink(struct net *src_net, struct net_device *dev, 
		return PTR_ERR(net);



	peer = rtnl_create_link(net, ifname, name_assign_type,

				&veth_link_ops, tbp);

				&veth_link_ops, tbp, extack);

	if (IS_ERR(peer)) {

		put_net(net);

		return PTR_ERR(peer);

drivers/net/vxlan.c

+1 −1
Original line number Diff line number Diff line
@@ -3749,7 +3749,7 @@ struct net_device *vxlan_dev_create(struct net *net, const char *name, 
	memset(&tb, 0, sizeof(tb));



	dev = rtnl_create_link(net, name, name_assign_type,

			       &vxlan_link_ops, tb);

			       &vxlan_link_ops, tb, NULL);

	if (IS_ERR(dev))

		return dev;

include/net/ip.h

+2 −1
Original line number Diff line number Diff line
@@ -421,7 +421,8 @@ static inline unsigned int ip_skb_dst_mtu(struct sock *sk, 
}



struct dst_metrics *ip_fib_metrics_init(struct net *net, struct nlattr *fc_mx,

					int fc_mx_len);

					int fc_mx_len,

					struct netlink_ext_ack *extack);

static inline void ip_fib_metrics_put(struct dst_metrics *fib_metrics)

{

	if (fib_metrics != &dst_default_metrics &&