mlx4_en: Fix crash upon device initialization error

commit 4234144f5ca69a0a13d5adae6c94b6937c52541f
Author: Alexander Guller <alexg@mellanox.com>
Date:   Sun Oct 9 05:29:35 2011 +0000

    mlx4_en: Fix crash upon device initialization error

    Netdevice was being freed without being unregistered first if
    mlx4_SET_PORT_general or mlx4_INIT_PORT failed.

    Signed-off-by: Alexander Guller <alexg@mellanox.co.il>
    Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Joe Jin <joe.jin@oracle.com>

diff --git a/drivers/net/mlx4/en_netdev.c b/drivers/net/mlx4/en_netdev.c
index 23567cd5d73f119bcf082b39498c0817dd564c0e..97c45841a28af2b91b69a65a115ff2937b4cf153 100644 (file)
--- a/drivers/net/mlx4/en_netdev.c
+++ b/drivers/net/mlx4/en_netdev.c
@@ -1097,6 +1097,7 @@ int mlx4_en_init_netdev(struct mlx4_en_dev *mdev, int port,
                en_err(priv, "Netdev registration failed for port %d\n", port);
                goto out;
        }
+       priv->registered = 1;
 
        en_warn(priv, "Using %d TX rings\n", prof->tx_ring_num);
        en_warn(priv, "Using %d RX rings\n", prof->rx_ring_num);
@@ -1118,7 +1119,6 @@ int mlx4_en_init_netdev(struct mlx4_en_dev *mdev, int port,
                en_err(priv, "Failed Initializing port\n");
                goto out;
        }
-       priv->registered = 1;
        mlx4_en_set_default_moderation(priv);
        queue_delayed_work(mdev->workqueue, &priv->stats_task, STATS_DELAY);
        return 0;