PERFORCE change 129177 for review

[Kip Macy]

http://perforce.freebsd.org/chv.cgi?CH=129177

Change 129177 by kmacy at kmacy:storage:toestack on 2007/11/17 22:33:17

	update most files to point to reflect toedev.h -> sys/netinet
	and cxgb specific code is now in cxgb_toedev.h

Affected files ...

.. //depot/projects/toestack/sys/dev/cxgb/cxgb_adapter.h#10 edit
.. //depot/projects/toestack/sys/dev/cxgb/cxgb_include.h#4 edit
.. //depot/projects/toestack/sys/dev/cxgb/cxgb_l2t.h#9 edit
.. //depot/projects/toestack/sys/dev/cxgb/cxgb_main.c#13 edit
.. //depot/projects/toestack/sys/dev/cxgb/cxgb_offload.c#18 edit
.. //depot/projects/toestack/sys/dev/cxgb/ulp/toecore/cxgb_toedev.h#1 add
.. //depot/projects/toestack/sys/dev/cxgb/ulp/toecore/toedev.h#8 delete
.. //depot/projects/toestack/sys/dev/cxgb/ulp/tom/cxgb_listen.c#6 edit
.. //depot/projects/toestack/sys/dev/cxgb/ulp/tom/cxgb_tom_sysctl.c#2 edit
.. //depot/projects/toestack/sys/netinet/tcp_ofld.c#6 edit
.. //depot/projects/toestack/sys/netinet/toedev.h#2 edit

Differences ...

==== //depot/projects/toestack/sys/dev/cxgb/cxgb_adapter.h#10 (text+ko) ====

@@ -57,13 +57,13 @@
 #ifdef CONFIG_DEFINED
 #include <cxgb_osdep.h>
 #include <t3cdev.h>
-#include <ulp/toecore/toedev.h>
+#include <ulp/toecore/cxgb_toedev.h>
 #include <sys/mbufq.h>
 #else
 #include <dev/cxgb/cxgb_osdep.h>
 #include <dev/cxgb/t3cdev.h>
 #include <dev/cxgb/sys/mbufq.h>
-#include <dev/cxgb/ulp/toecore/toedev.h>
+#include <dev/cxgb/ulp/toecore/cxgb_toedev.h>
 #endif
 
 #define USE_SX

==== //depot/projects/toestack/sys/dev/cxgb/cxgb_include.h#4 (text+ko) ====

@@ -12,7 +12,7 @@
 #include <common/cxgb_ctl_defs.h>
 #include <common/cxgb_sge_defs.h>
 #include <common/cxgb_firmware_exports.h>
-#include <ulp/toecore/toedev.h>
+#include <ulp/toecore/cxgb_toedev.h>
 #include <sys/mbufq.h>
 #include <common/jhash.h>
 
@@ -28,7 +28,7 @@
 #include <dev/cxgb/common/cxgb_sge_defs.h>
 #include <dev/cxgb/common/cxgb_firmware_exports.h>
 
-#include <dev/cxgb/ulp/toecore/toedev.h>
+#include <dev/cxgb/ulp/toecore/cxgb_toedev.h>
 #include <dev/cxgb/sys/mbufq.h>
 #include <dev/cxgb/common/jhash.h>
 #endif

==== //depot/projects/toestack/sys/dev/cxgb/cxgb_l2t.h#9 (text+ko) ====

@@ -31,7 +31,7 @@
 #ifndef _CHELSIO_L2T_H
 #define _CHELSIO_L2T_H
 
-#include <dev/cxgb/ulp/toecore/toedev.h>
+#include <dev/cxgb/ulp/toecore/cxgb_toedev.h>
 #include <sys/lock.h>
 
 #if __FreeBSD_version > 700000

==== //depot/projects/toestack/sys/dev/cxgb/cxgb_main.c#13 (text+ko) ====

@@ -924,8 +924,6 @@
 	}
 	ifp->if_flags |= IFF_MULTIQ;
 	ifp->if_mq_start = cxgb_pcpu_start;
-	ifp->if_mq_enqueue_packet = cxgb_pcpu_enqueue_packet;
-	ifp->if_mq_get_cookie = cxgb_pcpu_get_cookie;
 #endif
 	
 	ifp->if_timer = 0;	/* Disable ifnet watchdog */

==== //depot/projects/toestack/sys/dev/cxgb/cxgb_offload.c#18 (text+ko) ====

@@ -581,6 +581,8 @@
 	struct t3c_data *td = T3C_DATA (tdev);
 	struct toe_tid_entry *p = &td->tid_maps.tid_tab[tid];
 
+	printf("queuing tid release\n");
+	
 	mtx_lock(&td->tid_release_lock);
 	p->ctx = td->tid_release_list;
 	td->tid_release_list = p;

==== //depot/projects/toestack/sys/dev/cxgb/ulp/tom/cxgb_listen.c#6 (text+ko) ====

@@ -67,7 +67,7 @@
 #include <dev/cxgb/common/cxgb_ctl_defs.h>
 #include <dev/cxgb/cxgb_l2t.h>
 #include <dev/cxgb/cxgb_offload.h>
-#include <dev/cxgb/ulp/toecore/toedev.h>
+#include <dev/cxgb/ulp/toecore/cxgb_toedev.h>
 #include <dev/cxgb/ulp/tom/cxgb_defs.h>
 #include <dev/cxgb/ulp/tom/cxgb_tom.h>
 

==== //depot/projects/toestack/sys/dev/cxgb/ulp/tom/cxgb_tom_sysctl.c#2 (text+ko) ====

@@ -68,7 +68,7 @@
 #include <dev/cxgb/common/cxgb_t3_cpl.h>
 #include <dev/cxgb/cxgb_offload.h>
 #include <dev/cxgb/cxgb_l2t.h>
-#include <dev/cxgb/ulp/toecore/toedev.h>
+#include <dev/cxgb/ulp/toecore/cxgb_toedev.h>
 #include <dev/cxgb/ulp/tom/cxgb_tom.h>
 #include <dev/cxgb/ulp/tom/cxgb_defs.h>
 #include <dev/cxgb/ulp/tom/cxgb_t3_ddp.h>

==== //depot/projects/toestack/sys/netinet/tcp_ofld.c#6 (text+ko) ====

@@ -21,9 +21,7 @@
 #include <netinet/tcp.h>
 #include <netinet/tcp_var.h>
 #include <netinet/tcp_ofld.h>
-
-/* :-/ */
-#include <dev/cxgb/ulp/toecore/toedev.h>
+#include <netinet/toedev.h>
 
 int
 ofld_connect(struct socket *so, struct sockaddr *nam)

==== //depot/projects/toestack/sys/netinet/toedev.h#2 (text+ko) ====

@@ -56,16 +56,6 @@
 
 /* Get the toedev associated with a ifnet */
 #define TOEDEV(ifp) ((ifp)->if_spare2)
-
-/* offload type ids */
-enum {
-	TOE_ID_CHELSIO_T1 = 1,
-	TOE_ID_CHELSIO_T1C,
-	TOE_ID_CHELSIO_T2,
-	TOE_ID_CHELSIO_T3,
-	TOE_ID_CHELSIO_T3B,
-};
-
 struct offload_id {
 	unsigned int id;
 	unsigned long data;