Date: Fri, 14 Nov 2008 18:31:10 +0000 (UTC) From: "Bjoern A. Zeeb" <bz@FreeBSD.org> To: Paul Saab <ps@FreeBSD.org> Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org, Kip Macy <kmacy@FreeBSD.org> Subject: Re: svn commit: r184950 - in head/sys/modules/cxgb: iw_cxgb toecore Message-ID: <20081114182000.Y43380@maildrop.int.zabbadoz.net> In-Reply-To: <200811140156.mAE1uB0S075392@svn.freebsd.org> References: <200811140156.mAE1uB0S075392@svn.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
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 <bsd.kmod.mk> > -- Bjoern A. Zeeb Stop bit received. Insert coin for new game.
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20081114182000.Y43380>