Merge branch 'rxbusy' (e9f3a685) · Commits · 戴 / test

Mahesh Bandewar says: ==================== use netdev_is_rx_handler_busy() in few known cases netdev_rx_handler_register() was recently split into two parts - (a) check if the handler is used, (b) register the new handler, parts. This is helpful in scenarios like bonding where at the time of registration there is too much state to unwind and it should check if the device is free before building that state. IPvlan and macvlan drivers don't have this issue however it can make use of the same check instead of using a device specific check. ==================== Signed-off-by:

David S. Miller <davem@davemloft.net>

drivers/net/ipvlan/ipvlan_main.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -102,8 +102,8 @@ static int ipvlan_port_create(struct net_device *dev)
		return -EINVAL;
		}

		if (netif_is_macvlan_port(dev)) {
		netdev_err(dev, "Master is a macvlan port.\n");
		if (netdev_is_rx_handler_busy(dev)) {
		netdev_err(dev, "Device is already in use.\n");
		return -EBUSY;
		}

drivers/net/macvlan.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -1110,7 +1110,7 @@ static int macvlan_port_create(struct net_device *dev)
		if (dev->type != ARPHRD_ETHER \|\| dev->flags & IFF_LOOPBACK)
		return -EINVAL;

		if (netif_is_ipvlan_port(dev))
		if (netdev_is_rx_handler_busy(dev))
		return -EBUSY;

		port = kzalloc(sizeof(*port), GFP_KERNEL);

net/core/dev.c

+1 −3

Original line number	Diff line number	Diff line
		@@ -3961,9 +3961,7 @@ int netdev_rx_handler_register(struct net_device *dev,
		rx_handler_func_t *rx_handler,
		void *rx_handler_data)
		{
		ASSERT_RTNL();

		if (dev->rx_handler)
		if (netdev_is_rx_handler_busy(dev))
		return -EBUSY;

		/* Note: rx_handler_data must be set before rx_handler */

Admin message