diff options
Diffstat (limited to 'drivers/infiniband/ulp/ipoib/ipoib_main.c')
-rw-r--r-- | drivers/infiniband/ulp/ipoib/ipoib_main.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/infiniband/ulp/ipoib/ipoib_main.c b/drivers/infiniband/ulp/ipoib/ipoib_main.c index e072f3c32ce6..ace2345960ee 100644 --- a/drivers/infiniband/ulp/ipoib/ipoib_main.c +++ b/drivers/infiniband/ulp/ipoib/ipoib_main.c | |||
@@ -148,8 +148,6 @@ static int ipoib_stop(struct net_device *dev) | |||
148 | 148 | ||
149 | netif_stop_queue(dev); | 149 | netif_stop_queue(dev); |
150 | 150 | ||
151 | clear_bit(IPOIB_FLAG_NETIF_STOPPED, &priv->flags); | ||
152 | |||
153 | /* | 151 | /* |
154 | * Now flush workqueue to make sure a scheduled task doesn't | 152 | * Now flush workqueue to make sure a scheduled task doesn't |
155 | * bring our internal state back up. | 153 | * bring our internal state back up. |
@@ -895,7 +893,7 @@ int ipoib_dev_init(struct net_device *dev, struct ib_device *ca, int port) | |||
895 | goto out_rx_ring_cleanup; | 893 | goto out_rx_ring_cleanup; |
896 | } | 894 | } |
897 | 895 | ||
898 | /* priv->tx_head & tx_tail are already 0 */ | 896 | /* priv->tx_head, tx_tail & tx_outstanding are already 0 */ |
899 | 897 | ||
900 | if (ipoib_ib_dev_init(dev, ca, port)) | 898 | if (ipoib_ib_dev_init(dev, ca, port)) |
901 | goto out_tx_ring_cleanup; | 899 | goto out_tx_ring_cleanup; |