net/mlx4: Add VF link state support

[linux.git] / drivers / net / ethernet / mellanox / mlx4 / fw.c

diff --git a/drivers/net/ethernet/mellanox/mlx4/fw.c b/drivers/net/ethernet/mellanox/mlx4/fw.c
index 2c97901c6a6d2ff79231e294c5fd1d5622255263..569bbe3e7403596b918d2c011d2c3c5448c5f6bb 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx4/fw.c
+++ b/drivers/net/ethernet/mellanox/mlx4/fw.c
@@ -830,8 +830,10 @@ int mlx4_QUERY_PORT_wrapper(struct mlx4_dev *dev, int slave,
        u8 port_type;
        u16 short_field;
        int err;
+       int admin_link_state;
 
 #define MLX4_VF_PORT_NO_LINK_SENSE_MASK        0xE0
+#define MLX4_PORT_LINK_UP_MASK         0x80
 #define QUERY_PORT_CUR_MAX_PKEY_OFFSET 0x0c
 #define QUERY_PORT_CUR_MAX_GID_OFFSET  0x0e
 
@@ -861,6 +863,12 @@ int mlx4_QUERY_PORT_wrapper(struct mlx4_dev *dev, int slave,
                /* set port type to currently operating port type */
                port_type |= (dev->caps.port_type[vhcr->in_modifier] & 0x3);
 
+               admin_link_state = priv->mfunc.master.vf_oper[slave].vport[vhcr->in_modifier].state.link_state;
+               if (IFLA_VF_LINK_STATE_ENABLE == admin_link_state)
+                       port_type |= MLX4_PORT_LINK_UP_MASK;
+               else if (IFLA_VF_LINK_STATE_DISABLE == admin_link_state)
+                       port_type &= ~MLX4_PORT_LINK_UP_MASK;
+
                MLX4_PUT(outbox->buf, port_type,
                         QUERY_PORT_SUPPORTED_TYPE_OFFSET);