Skip to content

Commit

Permalink
net/hyperv: Use netif_tx_disable() instead of netif_stop_queue() when…
Browse files Browse the repository at this point in the history
… necessary

For code path not on the xmit, use netif_tx_disable() instead of
netif_stop_queue() to ensure other CPUs are not doing xmit.

Signed-off-by: Haiyang Zhang <haiyangz@microsoft.com>
Signed-off-by: K. Y. Srinivasan <kys@microsoft.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Haiyang Zhang authored and David S. Miller committed Feb 2, 2012
1 parent cb0a178 commit 0a28253
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions drivers/net/hyperv/netvsc_drv.c
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ static int netvsc_close(struct net_device *net)
struct hv_device *device_obj = net_device_ctx->device_ctx;
int ret;

netif_stop_queue(net);
netif_tx_disable(net);

ret = rndis_filter_close(device_obj);
if (ret != 0)
Expand Down Expand Up @@ -256,7 +256,7 @@ void netvsc_linkstatus_callback(struct hv_device *device_obj,
schedule_delayed_work(&ndev_ctx->dwork, msecs_to_jiffies(20));
} else {
netif_carrier_off(net);
netif_stop_queue(net);
netif_tx_disable(net);
}
}

Expand Down Expand Up @@ -337,7 +337,7 @@ static int netvsc_change_mtu(struct net_device *ndev, int mtu)

nvdev->start_remove = true;
cancel_delayed_work_sync(&ndevctx->dwork);
netif_stop_queue(ndev);
netif_tx_disable(ndev);
rndis_filter_device_remove(hdev);

ndev->mtu = mtu;
Expand Down Expand Up @@ -460,7 +460,7 @@ static int netvsc_remove(struct hv_device *dev)
cancel_delayed_work_sync(&ndev_ctx->dwork);

/* Stop outbound asap */
netif_stop_queue(net);
netif_tx_disable(net);

unregister_netdev(net);

Expand Down

0 comments on commit 0a28253

Please sign in to comment.