From: Mahesh Bandewar <mahe...@google.com>

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 <mahe...@google.com>
---
 net/core/dev.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/net/core/dev.c b/net/core/dev.c
index ad5959e56116..c8f1f67ff16c 100644
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -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 */
-- 
2.11.0.483.g087da7b7c-goog

Reply via email to