cxgb4, cxgb4i: move struct cpl_rx_data_ddp definition

move struct cpl_rx_data_ddp definition to
common header file t4_msg.h.

Signed-off-by: Varun Prakash <varun@chelsio.com>
Acked-by: Hariprasad Shenai <hariprasad@chelsio.com>
Signed-off-by: Nicholas Bellinger <nab@linux-iscsi.org>

diff --git a/drivers/net/ethernet/chelsio/cxgb4/t4_msg.h b/drivers/net/ethernet/chelsio/cxgb4/t4_msg.h
index 8cfc6a8344d82d924209cd1462cea784b5c04149..72792459ef89f0e06d94d15a391a471fbbb76e98 100644 (file)
--- a/drivers/net/ethernet/chelsio/cxgb4/t4_msg.h
+++ b/drivers/net/ethernet/chelsio/cxgb4/t4_msg.h
@@ -899,6 +899,21 @@ struct cpl_iscsi_hdr {
 #define ISCSI_DDP_V(x) ((x) << ISCSI_DDP_S)
 #define ISCSI_DDP_F    ISCSI_DDP_V(1U)
 
+struct cpl_rx_data_ddp {
+       union opcode_tid ot;
+       __be16 urg;
+       __be16 len;
+       __be32 seq;
+       union {
+               __be32 nxt_seq;
+               __be32 ddp_report;
+       };
+       __be32 ulp_crc;
+       __be32 ddpvld;
+};
+
+#define cpl_rx_iscsi_ddp cpl_rx_data_ddp
+
 struct cpl_rx_data {
        union opcode_tid ot;
        __be16 rsvd;

diff --git a/drivers/scsi/cxgbi/cxgb4i/cxgb4i.h b/drivers/scsi/cxgbi/cxgb4i/cxgb4i.h
index e5f8f656b222f609a37e2fee11951b95441608b6..2fd9c76fc21cb172fe76d3b2c8b3e4f422951a17 100644 (file)
--- a/drivers/scsi/cxgbi/cxgb4i/cxgb4i.h
+++ b/drivers/scsi/cxgbi/cxgb4i/cxgb4i.h
@@ -25,16 +25,4 @@
 
 #define T5_ISS_VALID           (1 << 18)
 
-struct cpl_rx_data_ddp {
-       union opcode_tid ot;
-       __be16 urg;
-       __be16 len;
-       __be32 seq;
-       union {
-               __be32 nxt_seq;
-               __be32 ddp_report;
-       };
-       __be32 ulp_crc;
-       __be32 ddpvld;
-};
 #endif /* __CXGB4I_H__ */