Merge branch 'sched/for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip...

[linux-2.6] / drivers / net / cxgb3 / t3cdev.h

diff --git a/drivers/net/cxgb3/t3cdev.h b/drivers/net/cxgb3/t3cdev.h
index fa4099bc0416a0220c6d80a29b9c01a22188f4db..0a21cfbd2b2135fd47aedad1803fcc5d6c446d8f 100644 (file)
--- a/drivers/net/cxgb3/t3cdev.h
+++ b/drivers/net/cxgb3/t3cdev.h
@@ -34,7 +34,6 @@
 
 #include <linux/list.h>
 #include <asm/atomic.h>
-#include <asm/semaphore.h>
 #include <linux/netdevice.h>
 #include <linux/proc_fs.h>
 #include <linux/skbuff.h>
@@ -42,14 +41,12 @@
 
 #define T3CNAMSIZ 16
 
-/* Get the t3cdev associated with a net_device */
-#define T3CDEV(netdev) (struct t3cdev *)(netdev->priv)
-
 struct cxgb3_client;
 
 enum t3ctype {
        T3A = 0,
-       T3B
+       T3B,
+       T3C,
 };
 
 struct t3cdev {
@@ -67,6 +64,7 @@ struct t3cdev {
        void *l3opt;            /* optional layer 3 data */
        void *l4opt;            /* optional layer 4 data */
        void *ulp;              /* ulp stuff */
+       void *ulp_iscsi;        /* ulp iscsi */
 };
 
 #endif                         /* _T3CDEV_H_ */