From owner-cvs-all@FreeBSD.ORG Mon Jun 13 17:00:23 2005 Return-Path: X-Original-To: cvs-all@FreeBSD.org Delivered-To: cvs-all@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 95D9B16A41C; Mon, 13 Jun 2005 17:00:23 +0000 (GMT) (envelope-from ume@mahoroba.org) Received: from cheer.mahoroba.org (gw4.mahoroba.org [218.45.22.175]) by mx1.FreeBSD.org (Postfix) with ESMTP id E4BB143D48; Mon, 13 Jun 2005 17:00:20 +0000 (GMT) (envelope-from ume@mahoroba.org) Received: from kasuga.mahoroba.org (IDENT:0DkoxE9/ngUOshj1OI5P4tsYB5aURtXtmZDj4Ud/pmWBb+ja37KbP0bcjX34Zlhy@[IPv6:2002:d2c4:765::1]) (user=ume mech=CRAM-MD5 bits=0) by cheer.mahoroba.org (8.13.3/8.13.3) with ESMTP/inet6 id j5DH01mx046416 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Tue, 14 Jun 2005 02:00:10 +0900 (JST) (envelope-from ume@mahoroba.org) Date: Tue, 14 Jun 2005 01:59:49 +0900 Message-ID: From: Hajimu UMEMOTO To: Brooks Davis In-Reply-To: <200506101649.j5AGnOPu077043@repoman.freebsd.org> References: <200506101649.j5AGnOPu077043@repoman.freebsd.org> User-Agent: xcite1.38> Wanderlust/2.14.0 (Africa) SEMI/1.14.6 (Maruoka) FLIM/1.14.7 (=?ISO-8859-4?Q?Sanj=F2?=) APEL/10.6 Emacs/21.3 (i386--freebsd) MULE/5.0 (SAKAKI) Organization: Internet Mutual Aid Society, YOKOHAMA X-PGP-Key: http://www.imasy.or.jp/~ume/publickey.asc X-PGP-Fingerprint: 1F00 0B9E 2164 70FC 6DC5 BF5F 04E9 F086 BF90 71FE MIME-Version: 1.0 (generated by SEMI 1.14.6 - "Maruoka") Content-Type: text/plain; charset=US-ASCII X-Greylist: Sender succeded SMTP AUTH authentication, not delayed by milter-greylist-2.0b5 (cheer.mahoroba.org [IPv6:3ffe:501:185b:8010::1]); Tue, 14 Jun 2005 02:00:12 +0900 (JST) X-Virus-Scanned: by amavisd-new X-Virus-Status: Clean X-Spam-Status: No, score=-1.4 required=5.0 tests=BAYES_00,SUBJ_HAS_SPACES autolearn=no version=3.0.4 X-Spam-Checker-Version: SpamAssassin 3.0.4 (2005-06-05) on cheer.mahoroba.org Cc: cvs-src@FreeBSD.org, src-committers@FreeBSD.org, cvs-all@FreeBSD.org Subject: Re: cvs commit: src/share/man/man9 ifnet.9 src/sys/compat/ndis kern_ndis.c subr_ndis.c src/sys/contrib/altq/altq altq_rio.c src/sys/contrib/dev/oltr if_oltr.c if_oltr_pci.c if_oltrvar.h src/sys/contrib/pf/net if_pflog.c if_pflog.h if_pfsync.c ... X-BeenThere: cvs-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: CVS commit messages for the entire tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 13 Jun 2005 17:00:23 -0000 Hi, >>>>> On Fri, 10 Jun 2005 16:49:24 +0000 (UTC) >>>>> Brooks Davis said: brooks> sys/net bpf.c bridge.c bridge.h bridgestp.c . . . brooks> if_spppfr.c if_spppsubr.c if_stf.c . . . brooks> Log: brooks> Stop embedding struct ifnet at the top of driver softcs. Instead the brooks> struct ifnet or the layer 2 common structure it was embedded in have brooks> been replaced with a struct ifnet pointer to be filled by a call to the brooks> new function, if_alloc(). The layer 2 common structure is also allocated brooks> via if_alloc() based on the interface type. It is hung off the new brooks> struct ifnet member, if_l2com. It broke stf. It touches ifp->if_softc without initializing it. Here is a patch: Index: sys/net/if_stf.c diff -u -p sys/net/if_stf.c.orig sys/net/if_stf.c --- sys/net/if_stf.c.orig Sat Jun 11 06:54:09 2005 +++ sys/net/if_stf.c Tue Jun 14 01:27:33 2005 @@ -215,12 +215,13 @@ stf_clone_create(struct if_clone *ifc, c return (err); sc = malloc(sizeof(struct stf_softc), M_STF, M_WAITOK | M_ZERO); - ifp = sc->sc_ifp = if_alloc(IFT_STF); + ifp = STF2IFP(sc) = if_alloc(IFT_STF); if (ifp == NULL) { free(sc, M_STF); ifc_free_unit(ifc, unit); return (ENOSPC); } + STF2IFP(sc)->if_softc = sc; /* * Set the name manually rather then using if_initname because * we don't conform to the default naming convention for interfaces. Sincerely, -- Hajimu UMEMOTO @ Internet Mutual Aid Society Yokohama, Japan ume@mahoroba.org ume@bisd.hitachi.co.jp ume@{,jp.}FreeBSD.org http://www.imasy.org/~ume/