aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMithlesh Thukral2009-03-20 17:36:44 +0530
committerGreg Kroah-Hartman2009-04-03 14:53:13 -0700
commit524ca9c196605ff38ae0532aad29ec2e91ad45d6 (patch)
treea72bb80754df2a1c059d4c89343e2dfcef79abc5
parentb9346e0fc5f0761c63a6e26c6436f0d6d645c826 (diff)
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>
-rw-r--r--drivers/staging/sxg/sxg.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/staging/sxg/sxg.c b/drivers/staging/sxg/sxg.c
index 884e56aa9f0f..c41dea0013bc 100644
--- 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);