Merge branch 'master' into for-next

1 files changed, 2 insertions, 0 deletions

diff --git a/include/linux/mlx4/cmd.h b/include/linux/mlx4/cmd.h
index 78a1b9671752..9a18667c13cc 100644
--- a/include/linux/mlx4/cmd.h
+++ b/include/linux/mlx4/cmd.h
@@ -58,6 +58,7 @@ enum {
         MLX4_CMD_SENSE_PORT      = 0x4d,
         MLX4_CMD_HW_HEALTH_CHECK = 0x50,
         MLX4_CMD_SET_PORT        = 0xc,
+        MLX4_CMD_SET_NODE        = 0x5a,
         MLX4_CMD_ACCESS_DDR      = 0x2e,
         MLX4_CMD_MAP_ICM         = 0xffa,
         MLX4_CMD_UNMAP_ICM       = 0xff9,
@@ -141,6 +142,7 @@ enum {
         MLX4_SET_PORT_MAC_TABLE = 0x2,
         MLX4_SET_PORT_VLAN_TABLE = 0x3,
         MLX4_SET_PORT_PRIO_MAP  = 0x4,
+        MLX4_SET_PORT_GID_TABLE = 0x5,
 };
 
 struct mlx4_dev;