mlx4_vnic: Kconfig and Makefile changes

Also fixed a potential uninitialized pointer problem in the vnic
driver when the MLX4_VNIC_DEBUG option is selected.

Signed-off-by: Ajaykumar Hotchandani <ajaykumar.hotchandani@oracle.com>
Signed-off-by: Qing Huang <qing.huang@oracle.com>

diff --git a/drivers/net/ethernet/mellanox/Kconfig b/drivers/net/ethernet/mellanox/Kconfig
index 8cf7563a8d9208b13c64d73b3f4ac59f5a849b40..2b17cde21e673520ea2d508408f159dd0f214aca 100644 (file)
--- a/drivers/net/ethernet/mellanox/Kconfig
+++ b/drivers/net/ethernet/mellanox/Kconfig
@@ -19,6 +19,7 @@ config NET_VENDOR_MELLANOX
 if NET_VENDOR_MELLANOX
 
 source "drivers/net/ethernet/mellanox/mlx4/Kconfig"
+source "drivers/net/ethernet/mellanox/mlx4_vnic/Kconfig"
 source "drivers/net/ethernet/mellanox/mlx5/core/Kconfig"
 
 endif # NET_VENDOR_MELLANOX

diff --git a/drivers/net/ethernet/mellanox/Makefile b/drivers/net/ethernet/mellanox/Makefile
index 38fe32ef5e5f438d713e840f6b83332f19e6a6a8..3b8fe1963f81afa7a41cab75503919d69ddd6634 100644 (file)
--- a/drivers/net/ethernet/mellanox/Makefile
+++ b/drivers/net/ethernet/mellanox/Makefile
@@ -3,4 +3,5 @@
 #
 
 obj-$(CONFIG_MLX4_CORE) += mlx4/
+obj-$(CONFIG_MLX4_VNIC) += mlx4_vnic/
 obj-$(CONFIG_MLX5_CORE) += mlx5/core/

diff --git a/drivers/net/ethernet/mellanox/mlx4_vnic/Kconfig b/drivers/net/ethernet/mellanox/mlx4_vnic/Kconfig
new file mode 100644 (file)
index 0000000..057b6a5
--- /dev/null
+++ b/drivers/net/ethernet/mellanox/mlx4_vnic/Kconfig
@@ -0,0 +1,14 @@
+config MLX4_VNIC
+       tristate "Mellanox Technologies VNIC support"
+       depends on PCI && INFINIBAND && INFINIBAND_ADDR_TRANS
+       select MLX4_CORE
+       help
+         Mellanox Technologies VNIC functionality.
+
+
+config MLX4_VNIC_DEBUG
+       bool "Mellanox Technologies VNIC debugging"
+       depends on MLX4_VNIC
+       help
+         This option causes debugging code to be compiled into
+         the mlx4_vnic driver.

diff --git a/drivers/net/ethernet/mellanox/mlx4_vnic/vnic_data_main.c b/drivers/net/ethernet/mellanox/mlx4_vnic/vnic_data_main.c
index 7e17e8de5a2ca9208ea247b21fbf78f8d49d77be..25e2c3e2da4eae6cc445d85b1e54b42bdad90393 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx4_vnic/vnic_data_main.c
+++ b/drivers/net/ethernet/mellanox/mlx4_vnic/vnic_data_main.c
@@ -983,20 +983,23 @@ free_mcasts:
 
 int vnic_member_add(struct vnic_login *login, int member_id, struct lag_member *member)
 {
-       struct vnic_gw_info *member_e;
+       struct vnic_gw_info *member_e = NULL;
        int ret;
 
        if (member_id >= MAX_LAG_MEMBERS || member_id < 0)
                return -1;
 
-       vnic_dbg_lag(login->name,"vnic_member_add id:%d gw_id:%d lid:%x qpn:%x sl:%d\n",
-                         member_id, member_e->gw_id, member->lid, member->qpn, member->sl);
        /* member id is already in use */
        if (login->lag_gw_neigh[member_id].info & GW_MEMBER_INFO_CREATED)
                return -1;
 
        member_e = &login->lag_gw_neigh[member_id];
 
+       vnic_dbg_lag(login->name,
+                    "vnic_member_add id:%d gw_id:%d lid:%x qpn:%x sl:%d\n",
+                    member_id, member_e->gw_id, member->lid, member->qpn,
+                    member->sl);
+
        /* create new entry */
        member_e->member_id = member_id;
        member_e->neigh.lid = member->lid;