From 524ca9c196605ff38ae0532aad29ec2e91ad45d6 Mon Sep 17 00:00:00 2001 From: Mithlesh Thukral Date: Fri, 20 Mar 2009 17:36:44 +0530 Subject: 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 Signed-off-by: Mithlesh Thukral Signed-off-by: Greg Kroah-Hartman --- drivers/staging/sxg/sxg.c | 2 -- 1 file changed, 2 deletions(-) (limited to 'drivers/staging/sxg') diff --git a/drivers/staging/sxg/sxg.c b/drivers/staging/sxg/sxg.c index 884e56a..c41dea0 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); -- cgit v1.1