cnic: Add FCoE support on 57712

- Connection ID (cid) management
- Slow-path command and response support
- Update version to 2.2.11.

Reviewed-by: Bhanu Prakash Gollapudi <bprakash@broadcom.com>
Signed-off-by: Michael Chan <mchan@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 16 insertions, 6 deletions

diff --git a/drivers/net/cnic_if.h b/drivers/net/cnic_if.h
index 33333e735f95..ccd814068c4d 100644
--- a/drivers/net/cnic_if.h
+++ b/drivers/net/cnic_if.h
@@ -12,22 +12,31 @@
 #ifndef CNIC_IF_H
 #define CNIC_IF_H
 
-#define CNIC_MODULE_VERSION     "2.2.6"
-#define CNIC_MODULE_RELDATE     "Oct 12, 2010"
+#define CNIC_MODULE_VERSION     "2.2.11"
+#define CNIC_MODULE_RELDATE     "Dec 22, 2010"
 
 #define CNIC_ULP_RDMA           0
 #define CNIC_ULP_ISCSI          1
-#define CNIC_ULP_L4             2
-#define MAX_CNIC_ULP_TYPE_EXT   2
-#define MAX_CNIC_ULP_TYPE       3
+#define CNIC_ULP_FCOE           2
+#define CNIC_ULP_L4             3
+#define MAX_CNIC_ULP_TYPE_EXT   3
+#define MAX_CNIC_ULP_TYPE       4
 
 struct kwqe {
         u32 kwqe_op_flag;
 
+#define KWQE_QID_SHIFT          8
 #define KWQE_OPCODE_MASK        0x00ff0000
 #define KWQE_OPCODE_SHIFT       16
-#define KWQE_FLAGS_LAYER_SHIFT  28
 #define KWQE_OPCODE(x)          ((x & KWQE_OPCODE_MASK) >> KWQE_OPCODE_SHIFT)
+#define KWQE_LAYER_MASK                 0x70000000
+#define KWQE_LAYER_SHIFT                28
+#define KWQE_FLAGS_LAYER_MASK_L2        (2<<28)
+#define KWQE_FLAGS_LAYER_MASK_L3        (3<<28)
+#define KWQE_FLAGS_LAYER_MASK_L4        (4<<28)
+#define KWQE_FLAGS_LAYER_MASK_L5_RDMA   (5<<28)
+#define KWQE_FLAGS_LAYER_MASK_L5_ISCSI  (6<<28)
+#define KWQE_FLAGS_LAYER_MASK_L5_FCOE   (7<<28)
 
         u32 kwqe_info0;
         u32 kwqe_info1;
@@ -62,6 +71,7 @@ struct kcqe {
                 #define KCQE_FLAGS_LAYER_MASK_L4        (4<<28)
                 #define KCQE_FLAGS_LAYER_MASK_L5_RDMA   (5<<28)
                 #define KCQE_FLAGS_LAYER_MASK_L5_ISCSI  (6<<28)
+                #define KCQE_FLAGS_LAYER_MASK_L5_FCOE   (7<<28)
                 #define KCQE_FLAGS_NEXT                 (1<<31)
                 #define KCQE_FLAGS_OPCODE_MASK          (0xff<<16)
                 #define KCQE_FLAGS_OPCODE_SHIFT         (16)