Staging: sxg: Fix a warning dump emitted by rtnl_watchdog during LTP tests

Fix a softlock warning message thrown up by the rtnl_timer.
This was observed during the LTP tests (interface up/down test)

Signed-off-by: LinSysSoft Sahara Team <saharaproj@linsyssoft.com>
Signed-off-by: Mithlesh Thukral <mithlesh@linsyssoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

diff --git a/drivers/staging/sxg/sxg.c b/drivers/staging/sxg/sxg.c
index 884e56aa9f0f09c356080ad45f11037153f4176d..c41dea0013bc0fff1c1599567f243b2120e6ad5f 100644 (file)
--- a/drivers/staging/sxg/sxg.c
+++ b/drivers/staging/sxg/sxg.c
@@ -2258,7 +2258,6 @@ int sxg_second_open(struct net_device * dev)
         /* Re-enable interrupts */
         SXG_ENABLE_ALL_INTERRUPTS(adapter);
 
-       netif_carrier_on(dev);
        sxg_register_intr(adapter);
        spin_unlock_irqrestore(&sxg_global.driver_lock, sxg_global.flags);
        return (STATUS_SUCCESS);
@@ -2329,7 +2328,6 @@ static int sxg_entry_halt(struct net_device *dev)
        /* Disable interrupts */
        SXG_DISABLE_ALL_INTERRUPTS(adapter);
 
-       netif_carrier_off(dev);
        spin_unlock_irqrestore(&sxg_global.driver_lock, sxg_global.flags);
 
        sxg_deregister_interrupt(adapter);