hyperv: Fix a kernel warning from netvsc_linkstatus_callback()

haiyangz · davem330 · commit fd5c07a8d6a1 · 2013-04-08T12:15:17.000-04:00
The warning about local_bh_enable inside IRQ happens when disconnecting a
virtual NIC.

The reason for the warning is -- netif_tx_disable() is called when the NIC
is disconnected. And it's called within irq context. netif_tx_disable() calls
local_bh_enable() which displays warning if in irq.

The fix is to remove the unnecessary netif_tx_disable &amp; wake_queue() in the
netvsc_linkstatus_callback().

Reported-by: Richard Genoud &lt;richard.genoud@gmail.com&gt;
Tested-by: Long Li &lt;longli@microsoft.com&gt;
Tested-by: Richard Genoud &lt;richard.genoud@gmail.com&gt;
Signed-off-by: Haiyang Zhang &lt;haiyangz@microsoft.com&gt;
Reviewed-by: K. Y. Srinivasan &lt;kys@microsoft.com&gt;
Signed-off-by: David S. Miller &lt;davem@davemloft.net&gt;
diff --git a/drivers/net/hyperv/netvsc_drv.c b/drivers/net/hyperv/netvsc_drv.c
@@ -241,13 +241,11 @@ void netvsc_linkstatus_callback(struct hv_device *device_obj,
 
 	if (status == 1) {
 		netif_carrier_on(net);
-		netif_wake_queue(net);
 		ndev_ctx = netdev_priv(net);
 		schedule_delayed_work(&ndev_ctx->dwork, 0);
 		schedule_delayed_work(&ndev_ctx->dwork, msecs_to_jiffies(20));
 	} else {
 		netif_carrier_off(net);
-		netif_tx_disable(net);
 	}
 }
 

Original file line number	Diff line number	Diff line change
`@@ -241,13 +241,11 @@ void netvsc_linkstatus_callback(struct hv_device *device_obj,`
`241`	`241`
`242`	`242`	`if (status == 1) {`
`243`	`243`	`netif_carrier_on(net);`
`244`		`- netif_wake_queue(net);`
`245`	`244`	`ndev_ctx = netdev_priv(net);`
`246`	`245`	`schedule_delayed_work(&ndev_ctx->dwork, 0);`
`247`	`246`	`schedule_delayed_work(&ndev_ctx->dwork, msecs_to_jiffies(20));`
`248`	`247`	`} else {`
`249`	`248`	`netif_carrier_off(net);`
`250`		`- netif_tx_disable(net);`
`251`	`249`	`}`
`252`	`250`	`}`
`253`	`251`