cxgb4i : Move stray CPL definitions to cxgb4 driver

These belong to the t4 msg header, will ensure there is no accidental code
duplication in the future

Signed-off-by: Anish Bhatt <anish@chelsio.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/chelsio/cxgb4/t4_msg.h b/drivers/net/ethernet/chelsio/cxgb4/t4_msg.h
index 0259feeab1b3a70b4f09f9011c01625b36db6e70..52e08103f221f8647355f61882be1601d0a428c1 100644 (file)
--- a/drivers/net/ethernet/chelsio/cxgb4/t4_msg.h
+++ b/drivers/net/ethernet/chelsio/cxgb4/t4_msg.h
@@ -75,6 +75,7 @@ enum {
        CPL_RX_DATA_DDP       = 0x42,
        CPL_PASS_ACCEPT_REQ   = 0x44,
        CPL_TRACE_PKT_T5      = 0x48,
+       CPL_RX_ISCSI_DDP      = 0x49,
 
        CPL_RDMA_READ_REQ     = 0x60,
 
@@ -86,6 +87,7 @@ enum {
        CPL_SGE_EGR_UPDATE    = 0xA5,
 
        CPL_TRACE_PKT         = 0xB0,
+       CPL_ISCSI_DATA        = 0xB2,
 
        CPL_FW4_MSG           = 0xC0,
        CPL_FW4_PLD           = 0xC1,

diff --git a/drivers/scsi/cxgbi/cxgb4i/cxgb4i.c b/drivers/scsi/cxgbi/cxgb4i/cxgb4i.c
index d31f9e600639351277026e3d47dd0a02943089f6..79788a12712d1ccc9274347f861cfb6bd9156d03 100644 (file)
--- a/drivers/scsi/cxgbi/cxgb4i/cxgb4i.c
+++ b/drivers/scsi/cxgbi/cxgb4i/cxgb4i.c
@@ -1384,8 +1384,6 @@ rel_resource:
        return -EINVAL;
 }
 
-#define CPL_ISCSI_DATA         0xB2
-#define CPL_RX_ISCSI_DDP       0x49
 cxgb4i_cplhandler_func cxgb4i_cplhandlers[NUM_CPL_CMDS] = {
        [CPL_ACT_ESTABLISH] = do_act_establish,
        [CPL_ACT_OPEN_RPL] = do_act_open_rpl,