Commit 1b7cd004 authored Jan 18, 2017 by Mahesh Bandewar Committed by David S. Miller Jan 20, 2017

net: remove duplicate code.



netdev_rx_handler_register() checks to see if the handler is already
busy which was recently separated into netdev_is_rx_handler_busy(). So
use the same function inside register() to avoid code duplication.
Essentially this change should be a no-op

Signed-off-by: Mahesh Bandewar <maheshb@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent 264b87fa

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 */