From owner-svn-src-head@FreeBSD.ORG Fri Nov 14 18:35:10 2008 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 5A09D1065673; Fri, 14 Nov 2008 18:35:10 +0000 (UTC) (envelope-from bz@FreeBSD.org) Received: from mail.cksoft.de (mail.cksoft.de [62.111.66.27]) by mx1.freebsd.org (Postfix) with ESMTP id DF4398FC18; Fri, 14 Nov 2008 18:35:09 +0000 (UTC) (envelope-from bz@FreeBSD.org) Received: from localhost (amavis.str.cksoft.de [192.168.74.71]) by mail.cksoft.de (Postfix) with ESMTP id 56C4941C707; Fri, 14 Nov 2008 19:35:08 +0100 (CET) X-Virus-Scanned: amavisd-new at cksoft.de Received: from mail.cksoft.de ([62.111.66.27]) by localhost (amavis.str.cksoft.de [192.168.74.71]) (amavisd-new, port 10024) with ESMTP id cMy9vwq5dm5f; Fri, 14 Nov 2008 19:35:05 +0100 (CET) Received: by mail.cksoft.de (Postfix, from userid 66) id C8E9041C6DB; Fri, 14 Nov 2008 19:35:05 +0100 (CET) Received: from maildrop.int.zabbadoz.net (maildrop.int.zabbadoz.net [10.111.66.10]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mail.int.zabbadoz.net (Postfix) with ESMTP id 1924A444888; Fri, 14 Nov 2008 18:31:10 +0000 (UTC) Date: Fri, 14 Nov 2008 18:31:10 +0000 (UTC) From: "Bjoern A. Zeeb" X-X-Sender: bz@maildrop.int.zabbadoz.net To: Paul Saab In-Reply-To: <200811140156.mAE1uB0S075392@svn.freebsd.org> Message-ID: <20081114182000.Y43380@maildrop.int.zabbadoz.net> References: <200811140156.mAE1uB0S075392@svn.freebsd.org> X-OpenPGP-Key: 0x14003F198FEFA3E77207EE8D2B58B8F83CCF1842 MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII; format=flowed Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org, Kip Macy Subject: Re: svn commit: r184950 - in head/sys/modules/cxgb: iw_cxgb toecore X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 14 Nov 2008 18:35:10 -0000 On Fri, 14 Nov 2008, Paul Saab wrote: > Author: ps > Date: Fri Nov 14 01:56:11 2008 > New Revision: 184950 > URL: http://svn.freebsd.org/changeset/base/184950 > > Log: > Fix world This commit message isn't really helpful. I guess what was broken was building those two modules individually by hand? I can only guess here:( I guess it's all realted to my #ifdef INET or rather to the conditional include of opt_inet.h in cxgb_osdep.h. I just had a hard time to figure out why those two modules would actually need it and from what I can see it's possibly because they include cxgb_include.h which indirectly includes a good list of headers and cxgb_osdep.h is one of them. Now the define for LRO_SUPPORTED is not needed anythere there, so a better fix would be to handle that case different? By all means I cannot figure out how the including of headers in cxgb was meant to work but that's probably a result of staying close to vendor code and in some areas and doing only minimalistic changes for FreeBSD? On a side note I just realized that there is: ./ulp/tom/cxgb_tcp.h:#ifdef INET6 but obviously is dead code because we nowhere depend on/include opt_inet6.h which in turn does not matter as there is no cxgb_tcp6_usrreqs anywhere from what I can see. > Approved by: kmacy > > Modified: > head/sys/modules/cxgb/iw_cxgb/Makefile > head/sys/modules/cxgb/toecore/Makefile > > Modified: head/sys/modules/cxgb/iw_cxgb/Makefile > ============================================================================== > --- head/sys/modules/cxgb/iw_cxgb/Makefile Fri Nov 14 01:53:10 2008 (r184949) > +++ head/sys/modules/cxgb/iw_cxgb/Makefile Fri Nov 14 01:56:11 2008 (r184950) > @@ -7,7 +7,7 @@ KMOD= iw_cxgb > SRCS= iw_cxgb.c iw_cxgb_cm.c iw_cxgb_hal.c > SRCS+= iw_cxgb_provider.c iw_cxgb_qp.c iw_cxgb_resource.c > SRCS+= iw_cxgb_ev.c iw_cxgb_mem.c iw_cxgb_dbg.c iw_cxgb_cq.c > -SRCS+= bus_if.h device_if.h opt_sched.h pci_if.h pcib_if.h opt_ktr.h > +SRCS+= bus_if.h device_if.h opt_sched.h pci_if.h pcib_if.h opt_ktr.h opt_inet.h > CFLAGS+= -g -I${CXGB} > #CFLAGS+= -DDEBUG > > > Modified: head/sys/modules/cxgb/toecore/Makefile > ============================================================================== > --- head/sys/modules/cxgb/toecore/Makefile Fri Nov 14 01:53:10 2008 (r184949) > +++ head/sys/modules/cxgb/toecore/Makefile Fri Nov 14 01:56:11 2008 (r184950) > @@ -5,7 +5,7 @@ CXGB = ${.CURDIR}/../../../dev/cxgb > > KMOD= toecore > SRCS= toedev.c > -SRCS+= device_if.h bus_if.h pci_if.h opt_sched.h > +SRCS+= device_if.h bus_if.h pci_if.h opt_sched.h opt_inet.h > CFLAGS+= -g -I${CXGB} > > .include > -- Bjoern A. Zeeb Stop bit received. Insert coin for new game.