Merge branch 'omap-pool'

[linux-2.6-omap-h63xx.git] / drivers / scsi / cxgb3i / cxgb3i_offload.h

diff --git a/drivers/scsi/cxgb3i/cxgb3i_offload.h b/drivers/scsi/cxgb3i/cxgb3i_offload.h
index 275f23f16eb7f6bc5a68691fb969268dc1ea4502..ebfca960c0a9d8358236c8658c084e44bda4ed3d 100644 (file)
--- a/drivers/scsi/cxgb3i/cxgb3i_offload.h
+++ b/drivers/scsi/cxgb3i/cxgb3i_offload.h
@@ -16,7 +16,7 @@
 #define _CXGB3I_OFFLOAD_H
 
 #include <linux/skbuff.h>
-#include <net/tcp.h>
+#include <linux/in.h>
 
 #include "common.h"
 #include "adapter.h"
@@ -135,11 +135,11 @@ enum c3cn_flags {
        C3CN_ABORT_RPL_PENDING, /* expecting an abort reply */
        C3CN_TX_DATA_SENT,      /* already sent a TX_DATA WR */
        C3CN_ACTIVE_CLOSE_NEEDED,       /* need to be closed */
+       C3CN_OFFLOAD_DOWN       /* offload function off */
 };
 
 /**
  * cxgb3i_sdev_data - Per adapter data.
- *
  * Linked off of each Ethernet device port on the adapter.
  * Also available via the t3cdev structure since we have pointers to our port
  * net_device's there ...
@@ -148,16 +148,17 @@ enum c3cn_flags {
  * @cdev:      t3cdev adapter
  * @client:    CPL client pointer
  * @ports:     array of adapter ports
- * @sport_map_next: next index into the port map
- * @sport_map: source port map
+ * @sport_next: next port
+ * @sport_conn:        source port connection
  */
 struct cxgb3i_sdev_data {
        struct list_head list;
        struct t3cdev *cdev;
        struct cxgb3_client *client;
        struct adap_ports ports;
-       unsigned int sport_map_next;
-       unsigned long sport_map[0];
+       spinlock_t lock;
+       unsigned int sport_next;
+       struct s3_conn *sport_conn[0];
 };
 #define NDEV2CDATA(ndev) (*(struct cxgb3i_sdev_data **)&(ndev)->ec_ptr)
 #define CXGB3_SDEV_DATA(cdev) NDEV2CDATA((cdev)->lldev)