From owner-p4-projects@FreeBSD.ORG Sat Nov 17 22:33:59 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4F29C16A468; Sat, 17 Nov 2007 22:33:59 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id EF30916A419 for ; Sat, 17 Nov 2007 22:33:58 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id E1F2C13C459 for ; Sat, 17 Nov 2007 22:33:58 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lAHMXw8X043293 for ; Sat, 17 Nov 2007 22:33:58 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lAHMXw7U043290 for perforce@freebsd.org; Sat, 17 Nov 2007 22:33:58 GMT (envelope-from kmacy@freebsd.org) Date: Sat, 17 Nov 2007 22:33:58 GMT Message-Id: <200711172233.lAHMXw7U043290@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 129177 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 17 Nov 2007 22:33:59 -0000 http://perforce.freebsd.org/chv.cgi?CH=129177 Change 129177 by kmacy@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 #include -#include +#include #include #else #include #include #include -#include +#include #endif #define USE_SX ==== //depot/projects/toestack/sys/dev/cxgb/cxgb_include.h#4 (text+ko) ==== @@ -12,7 +12,7 @@ #include #include #include -#include +#include #include #include @@ -28,7 +28,7 @@ #include #include -#include +#include #include #include #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 +#include #include #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 #include #include -#include +#include #include #include ==== //depot/projects/toestack/sys/dev/cxgb/ulp/tom/cxgb_tom_sysctl.c#2 (text+ko) ==== @@ -68,7 +68,7 @@ #include #include #include -#include +#include #include #include #include ==== //depot/projects/toestack/sys/netinet/tcp_ofld.c#6 (text+ko) ==== @@ -21,9 +21,7 @@ #include #include #include - -/* :-/ */ -#include +#include 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;