- Remove default NIC dependency on ulp headers

- make toe module build dependent on kernel support

Submitted by:	Chelsio Inc.
MFC after:	1 week

11 files changed, 9 insertions, 4 deletions

diff --git a/sys/dev/cxgb/cxgb_adapter.h b/sys/dev/cxgb/cxgb_adapter.h
index db79fe3..2f274eb 100644
--- a/sys/dev/cxgb/cxgb_adapter.h
+++ b/sys/dev/cxgb/cxgb_adapter.h
@@ -56,7 +56,6 @@ $FreeBSD$
 
 #include <cxgb_osdep.h>
 #include <t3cdev.h>
-#include <ulp/toecore/cxgb_toedev.h>
 #include <sys/mbufq.h>
 
 #ifdef LRO_SUPPORTED
diff --git a/sys/dev/cxgb/cxgb_include.h b/sys/dev/cxgb/cxgb_include.h
index ec318f6..90080b5 100644
--- a/sys/dev/cxgb/cxgb_include.h
+++ b/sys/dev/cxgb/cxgb_include.h
@@ -16,4 +16,3 @@
 #include <common/cxgb_sge_defs.h>
 #include <common/cxgb_firmware_exports.h>
 #include <common/jhash.h>
-#include <ulp/toecore/cxgb_toedev.h>
diff --git a/sys/dev/cxgb/cxgb_offload.h b/sys/dev/cxgb/cxgb_offload.h
index 54d7337..dccefdc 100644
--- a/sys/dev/cxgb/cxgb_offload.h
+++ b/sys/dev/cxgb/cxgb_offload.h
@@ -35,7 +35,6 @@ $FreeBSD$
 
 #include <common/cxgb_version.h>
 #include <cxgb_config.h>
-#include <ulp/tom/cxgb_l2t.h>
 #include <common/cxgb_tcb.h>
 #include <t3cdev.h>
 
@@ -71,6 +70,7 @@ void cxgb_remove_clients(struct t3cdev *tdev);
 typedef int (*cxgb_cpl_handler_func)(struct t3cdev *dev,
 				      struct mbuf *m, void *ctx);
 
+struct l2t_entry;
 struct cxgb_client {
 	char 			*name;
 	void 			(*add) (struct t3cdev *);
diff --git a/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_hal.c b/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_hal.c
index f2e59d2..cf42e38 100644
--- a/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_hal.c
+++ b/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_hal.c
@@ -64,6 +64,7 @@ __FBSDID("$FreeBSD$");
 #include <contrib/rdma/ib_verbs.h>
 
 #include <cxgb_include.h>
+#include <ulp/tom/cxgb_l2t.h>
 #include <ulp/iw_cxgb/iw_cxgb_wr.h>
 #include <ulp/iw_cxgb/iw_cxgb_hal.h>
 #include <ulp/iw_cxgb/iw_cxgb_provider.h>
diff --git a/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_qp.c b/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_qp.c
index 708c359..83c742f 100644
--- a/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_qp.c
+++ b/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_qp.c
@@ -64,6 +64,7 @@ __FBSDID("$FreeBSD$");
 #include <contrib/rdma/ib_user_verbs.h>
 
 #include <cxgb_include.h>
+#include <ulp/tom/cxgb_l2t.h>
 #include <ulp/iw_cxgb/iw_cxgb_wr.h>
 #include <ulp/iw_cxgb/iw_cxgb_hal.h>
 #include <ulp/iw_cxgb/iw_cxgb_provider.h>
diff --git a/sys/dev/cxgb/ulp/toecore/toedev.c b/sys/dev/cxgb/ulp/toecore/toedev.c
index 78d3874..01a7d90 100644
--- a/sys/dev/cxgb/ulp/toecore/toedev.c
+++ b/sys/dev/cxgb/ulp/toecore/toedev.c
@@ -53,7 +53,7 @@ __FBSDID("$FreeBSD$");
  * XXX 
  */
 #include <cxgb_include.h>
-
+#include <ulp/toecore/cxgb_toedev.h>
 
 static struct mtx offload_db_lock;
 static TAILQ_HEAD(, toedev) offload_dev_list;
diff --git a/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c b/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c
index 073d291..62ffdaa 100644
--- a/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c
+++ b/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c
@@ -91,6 +91,7 @@ __FBSDID("$FreeBSD$");
 #include <machine/bus.h>
 #include <sys/mvec.h>
 #include <ulp/toecore/cxgb_toedev.h>
+#include <ulp/tom/cxgb_l2t.h>
 #include <ulp/tom/cxgb_defs.h>
 #include <ulp/tom/cxgb_tom.h>
 #include <ulp/tom/cxgb_t3_ddp.h>
diff --git a/sys/dev/cxgb/ulp/tom/cxgb_l2t.c b/sys/dev/cxgb/ulp/tom/cxgb_l2t.c
index 1fcd53d..67856e6 100644
--- a/sys/dev/cxgb/ulp/tom/cxgb_l2t.c
+++ b/sys/dev/cxgb/ulp/tom/cxgb_l2t.c
@@ -51,6 +51,7 @@ __FBSDID("$FreeBSD$");
 #include <netinet/if_ether.h>
 
 #include <cxgb_include.h>
+#include <ulp/tom/cxgb_l2t.h>
 
 #define VLAN_NONE 0xfff
 #define SDL(s) ((struct sockaddr_dl *)s) 
diff --git a/sys/dev/cxgb/ulp/tom/cxgb_listen.c b/sys/dev/cxgb/ulp/tom/cxgb_listen.c
index 8836b58..5dc2d9f 100644
--- a/sys/dev/cxgb/ulp/tom/cxgb_listen.c
+++ b/sys/dev/cxgb/ulp/tom/cxgb_listen.c
@@ -71,6 +71,7 @@ __FBSDID("$FreeBSD$");
 #include <common/cxgb_ctl_defs.h>
 #include <cxgb_offload.h>
 #include <ulp/toecore/cxgb_toedev.h>
+#include <ulp/tom/cxgb_l2t.h>
 #include <ulp/tom/cxgb_defs.h>
 #include <ulp/tom/cxgb_tom.h>
 #include <ulp/tom/cxgb_t3_ddp.h>
diff --git a/sys/dev/cxgb/ulp/tom/cxgb_tom.c b/sys/dev/cxgb/ulp/tom/cxgb_tom.c
index 1067b32..d586883 100644
--- a/sys/dev/cxgb/ulp/tom/cxgb_tom.c
+++ b/sys/dev/cxgb/ulp/tom/cxgb_tom.c
@@ -82,6 +82,7 @@ __FBSDID("$FreeBSD$");
 #include <common/cxgb_t3_cpl.h>
 #include <cxgb_offload.h>
 #include <ulp/toecore/cxgb_toedev.h>
+#include <ulp/tom/cxgb_l2t.h>
 #include <ulp/tom/cxgb_tom.h>
 #include <ulp/tom/cxgb_defs.h>
 #include <ulp/tom/cxgb_t3_ddp.h>
diff --git a/sys/dev/cxgb/ulp/tom/cxgb_tom.h b/sys/dev/cxgb/ulp/tom/cxgb_tom.h
index bcda2c3..2f3201d 100644
--- a/sys/dev/cxgb/ulp/tom/cxgb_tom.h
+++ b/sys/dev/cxgb/ulp/tom/cxgb_tom.h
@@ -33,6 +33,7 @@ $FreeBSD$
 #ifndef CXGB_TOM_H_
 #define CXGB_TOM_H_
 #include <sys/protosw.h>
+#include <netinet/toedev.h>
 
 #define LISTEN_INFO_HASH_SIZE 32