Merge git://git.kernel.org/pub/scm/linux/kernel/git/agk/linux-2.6-dm

[linux-2.6-omap-h63xx.git] / include / linux / mlx4 / cmd.h

diff --git a/include/linux/mlx4/cmd.h b/include/linux/mlx4/cmd.h
index 4fb552d12f7ae3fbd51de76b1ad0480750955c06..cf9c679ab38b59fe8cb9794e4837e50dd1c9445d 100644 (file)
--- a/include/linux/mlx4/cmd.h
+++ b/include/linux/mlx4/cmd.h
@@ -54,6 +54,7 @@ enum {
        MLX4_CMD_INIT_PORT       = 0x9,
        MLX4_CMD_CLOSE_PORT      = 0xa,
        MLX4_CMD_QUERY_HCA       = 0xb,
+       MLX4_CMD_QUERY_PORT      = 0x43,
        MLX4_CMD_SET_PORT        = 0xc,
        MLX4_CMD_ACCESS_DDR      = 0x2e,
        MLX4_CMD_MAP_ICM         = 0xffa,
@@ -80,7 +81,7 @@ enum {
        MLX4_CMD_SW2HW_CQ        = 0x16,
        MLX4_CMD_HW2SW_CQ        = 0x17,
        MLX4_CMD_QUERY_CQ        = 0x18,
-       MLX4_CMD_RESIZE_CQ       = 0x2c,
+       MLX4_CMD_MODIFY_CQ       = 0x2c,
 
        /* SRQ commands */
        MLX4_CMD_SW2HW_SRQ       = 0x35,
@@ -131,6 +132,15 @@ enum {
        MLX4_MAILBOX_SIZE       =  4096
 };
 
+enum {
+       /* set port opcode modifiers */
+       MLX4_SET_PORT_GENERAL   = 0x0,
+       MLX4_SET_PORT_RQP_CALC  = 0x1,
+       MLX4_SET_PORT_MAC_TABLE = 0x2,
+       MLX4_SET_PORT_VLAN_TABLE = 0x3,
+       MLX4_SET_PORT_PRIO_MAP  = 0x4,
+};
+
 struct mlx4_dev;
 
 struct mlx4_cmd_mailbox {