From 9984ac7cb5c5f1613a7d23a748c2259c2b7d2f3a Mon Sep 17 00:00:00 2001 From: Yevgeny Petrilin Date: Tue, 24 Aug 2010 03:45:45 +0000 Subject: [PATCH] --- yaml --- r: 213939 b: refs/heads/master c: 7c2873809dd1a2d5e46be3f0ff2071fcdc3cf0fd h: refs/heads/master i: 213937: b25833b771a272700b4479a784cf7afb7d166eef 213935: 38611b96d8debd4cc9e2c79910497fa8d335170b v: v3 --- [refs] | 2 +- trunk/drivers/net/mlx4/en_netdev.c | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index b62e046d1197..b4fd32d2b499 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8bf2e58f8b7a14244bf182ad0a3ba0457ad70c62 +refs/heads/master: 7c2873809dd1a2d5e46be3f0ff2071fcdc3cf0fd diff --git a/trunk/drivers/net/mlx4/en_netdev.c b/trunk/drivers/net/mlx4/en_netdev.c index 4d6dac7617f7..985e6f83b31a 100644 --- a/trunk/drivers/net/mlx4/en_netdev.c +++ b/trunk/drivers/net/mlx4/en_netdev.c @@ -704,9 +704,8 @@ void mlx4_en_stop_port(struct net_device *dev) netif_tx_stop_all_queues(dev); netif_tx_unlock_bh(dev); - /* close port*/ + /* Set port as not active */ priv->port_up = false; - mlx4_CLOSE_PORT(mdev->dev, priv->port); /* Unregister Mac address for the port */ mlx4_unregister_mac(mdev->dev, priv->port, priv->mac_index); @@ -731,6 +730,9 @@ void mlx4_en_stop_port(struct net_device *dev) msleep(1); mlx4_en_deactivate_cq(priv, &priv->rx_cq[i]); } + + /* close port*/ + mlx4_CLOSE_PORT(mdev->dev, priv->port); } static void mlx4_en_restart(struct work_struct *work)