Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ca752be0 authored by David Ahern's avatar David Ahern Committed by David S. Miller
Browse files

net: bridge: Pass extack to down to netdev_master_upper_dev_link 



Pass extack arg to br_add_if. Add messages for a couple of failures
and pass arg to netdev_master_upper_dev_link.

Signed-off-by: default avatarDavid Ahern <dsahern@gmail.com>
Acked-by: default avatarStephen Hemminger <stephen@networkplumber.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 759088bd

net/bridge/br_device.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -326,7 +326,7 @@ static int br_add_slave(struct net_device *dev, struct net_device *slave_dev, 
{

{

	struct net_bridge *br = netdev_priv(dev);

	struct net_bridge *br = netdev_priv(dev);





	return br_add_if(br, slave_dev);

	return br_add_if(br, slave_dev, extack);

}

}





static int br_del_slave(struct net_device *dev, struct net_device *slave_dev)

static int br_del_slave(struct net_device *dev, struct net_device *slave_dev)

net/bridge/br_if.c

+11 −4
Original line number Original line Diff line number Diff line
@@ -480,7 +480,8 @@ netdev_features_t br_features_recompute(struct net_bridge *br, 
}

}





/* called with RTNL */

/* called with RTNL */

int br_add_if(struct net_bridge *br, struct net_device *dev)

int br_add_if(struct net_bridge *br, struct net_device *dev,

	      struct netlink_ext_ack *extack)

{

{

	struct net_bridge_port *p;

	struct net_bridge_port *p;

	int err = 0;

	int err = 0;
@@ -500,16 +501,22 @@ int br_add_if(struct net_bridge *br, struct net_device *dev) 
		return -EINVAL;

		return -EINVAL;





	/* No bridging of bridges */

	/* No bridging of bridges */

	if (dev->netdev_ops->ndo_start_xmit == br_dev_xmit)

	if (dev->netdev_ops->ndo_start_xmit == br_dev_xmit) {

		NL_SET_ERR_MSG(extack,

			       "Can not enslave a bridge to a bridge");

		return -ELOOP;

		return -ELOOP;

	}





	/* Device is already being bridged */

	/* Device is already being bridged */

	if (br_port_exists(dev))

	if (br_port_exists(dev))

		return -EBUSY;

		return -EBUSY;





	/* No bridging devices that dislike that (e.g. wireless) */

	/* No bridging devices that dislike that (e.g. wireless) */

	if (dev->priv_flags & IFF_DONT_BRIDGE)

	if (dev->priv_flags & IFF_DONT_BRIDGE) {

		NL_SET_ERR_MSG(extack,

			       "Device does not allow enslaving to a bridge");

		return -EOPNOTSUPP;

		return -EOPNOTSUPP;

	}





	p = new_nbp(br, dev);

	p = new_nbp(br, dev);

	if (IS_ERR(p))

	if (IS_ERR(p))
@@ -540,7 +547,7 @@ int br_add_if(struct net_bridge *br, struct net_device *dev) 




	dev->priv_flags |= IFF_BRIDGE_PORT;

	dev->priv_flags |= IFF_BRIDGE_PORT;





	err = netdev_master_upper_dev_link(dev, br->dev, NULL, NULL, NULL);

	err = netdev_master_upper_dev_link(dev, br->dev, NULL, NULL, extack);

	if (err)

	if (err)

		goto err5;

		goto err5;

net/bridge/br_ioctl.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -98,7 +98,7 @@ static int add_del_if(struct net_bridge *br, int ifindex, int isadd) 
		return -EINVAL;

		return -EINVAL;





	if (isadd)

	if (isadd)

		ret = br_add_if(br, dev);

		ret = br_add_if(br, dev, NULL);

	else

	else

		ret = br_del_if(br, dev);

		ret = br_del_if(br, dev);

net/bridge/br_private.h

+2 −1
Original line number Original line Diff line number Diff line
@@ -566,7 +566,8 @@ void br_flood(struct net_bridge *br, struct sk_buff *skb, 
void br_port_carrier_check(struct net_bridge_port *p);

void br_port_carrier_check(struct net_bridge_port *p);

int br_add_bridge(struct net *net, const char *name);

int br_add_bridge(struct net *net, const char *name);

int br_del_bridge(struct net *net, const char *name);

int br_del_bridge(struct net *net, const char *name);

int br_add_if(struct net_bridge *br, struct net_device *dev);

int br_add_if(struct net_bridge *br, struct net_device *dev,

	      struct netlink_ext_ack *extack);

int br_del_if(struct net_bridge *br, struct net_device *dev);

int br_del_if(struct net_bridge *br, struct net_device *dev);

int br_min_mtu(const struct net_bridge *br);

int br_min_mtu(const struct net_bridge *br);

netdev_features_t br_features_recompute(struct net_bridge *br,

netdev_features_t br_features_recompute(struct net_bridge *br,