From owner-svn-src-all@FreeBSD.ORG Wed Mar 7 07:30:44 2012 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 6D574106566B; Wed, 7 Mar 2012 07:30:44 +0000 (UTC) (envelope-from pluknet@gmail.com) Received: from mail-lpp01m010-f54.google.com (mail-lpp01m010-f54.google.com [209.85.215.54]) by mx1.freebsd.org (Postfix) with ESMTP id 3E1EB8FC08; Wed, 7 Mar 2012 07:30:42 +0000 (UTC) Received: by lagv3 with SMTP id v3so9817646lag.13 for ; Tue, 06 Mar 2012 23:30:42 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:sender:in-reply-to:references:date :x-google-sender-auth:message-id:subject:from:to:cc:content-type :content-transfer-encoding; bh=ogktaXZT/Io6UW+HYsdLgqXFuNoAtOv/z5IWSYd1gO4=; b=J0jw7Z9/3htYz9IR8A2KkR6n9tJ9sHNqS3eq5727O8uOn5ZFhp7++qSrGaSEEZ+Qa2 5QeI0XSSBHar3hW5vAU/5bweJuzg060aB2mDq+jZ95duoByB/6Iub6oqLs13UYGQopJT iWrbJChDkI6LCvnZpcQc3GMuDaoMwv8n3UbyDZLKbNEQC75WL2JxEJ6hSuNCXUJ/+XmL bBPG8cEeTJKmyi4csUo7OBleQxROhsS8+qz0LdewLAljnPByJnNUhUrliWN6tzNOGyVX jOwK6gHS0bBlEpKvmoZqw/lCYGqceTJgp3OMU+QDIin+1Gno8GZFpJFNoYzYkWF2OfnO CnZw== MIME-Version: 1.0 Received: by 10.112.102.161 with SMTP id fp1mr301395lbb.71.1331105442077; Tue, 06 Mar 2012 23:30:42 -0800 (PST) Sender: pluknet@gmail.com Received: by 10.152.21.73 with HTTP; Tue, 6 Mar 2012 23:30:41 -0800 (PST) In-Reply-To: <201203070722.q277MrwJ080590@svn.freebsd.org> References: <201203070722.q277MrwJ080590@svn.freebsd.org> Date: Wed, 7 Mar 2012 10:30:41 +0300 X-Google-Sender-Auth: bEBmBimoViHcKj4ybQOpPY4vXbY Message-ID: From: Sergey Kandaurov To: Andrew Thompson Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org Subject: Re: svn commit: r232640 - head/sys/net X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 07 Mar 2012 07:30:44 -0000 On 7 March 2012 11:22, Andrew Thompson wrote: > Author: thompsa > Date: Wed Mar =A07 07:22:53 2012 > New Revision: 232640 > URL: http://svn.freebsd.org/changeset/base/232640 > > Log: > =A0Move the vlan buffer space into the union which also fixes an unused v= ariable > =A0warning with !INET & !INET6. > > =A0Spotted by: =A0 pluknet > > Modified: > =A0head/sys/net/if_lagg.c Thank you. BTW, how do you like this change? Index: Makefile =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- Makefile (revision 232637) +++ Makefile (working copy) @@ -7,8 +7,10 @@ SRCS=3D if_lagg.c ieee8023ad_lacp.c opt_inet.h opt_inet6.h .if !defined(KERNBUILDDIR) +.if ${MK_INET_SUPPORT} !=3D "no" opt_inet.h: echo "#define INET 1" > ${.TARGET} +.endif .if ${MK_INET6_SUPPORT} !=3D "no" opt_inet6.h: > > Modified: head/sys/net/if_lagg.c > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- head/sys/net/if_lagg.c =A0 =A0 =A0Wed Mar =A07 06:42:21 2012 =A0 =A0 = =A0 =A0(r232639) > +++ head/sys/net/if_lagg.c =A0 =A0 =A0Wed Mar =A07 07:22:53 2012 =A0 =A0 = =A0 =A0(r232640) > @@ -1438,7 +1438,6 @@ lagg_hashmbuf(struct lagg_softc *sc, str > =A0 =A0 =A0 =A0uint32_t p =3D key; > =A0 =A0 =A0 =A0int off; > =A0 =A0 =A0 =A0struct ether_header *eh; > - =A0 =A0 =A0 struct ether_vlan_header vlanbuf; > =A0 =A0 =A0 =A0const struct ether_vlan_header *vlan; > =A0#ifdef INET > =A0 =A0 =A0 =A0const struct ip *ip; > @@ -1456,6 +1455,7 @@ lagg_hashmbuf(struct lagg_softc *sc, str > =A0#ifdef INET6 > =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0struct ip6_hdr ip6; > =A0#endif > + =A0 =A0 =A0 =A0 =A0 =A0 =A0 struct ether_vlan_header vlan; > =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0uint32_t port; > =A0 =A0 =A0 =A0} buf; > > @@ -1475,7 +1475,7 @@ lagg_hashmbuf(struct lagg_softc *sc, str > =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0p =3D hash32_buf(&m->m_pkthdr.ether_vtag, > =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0sizeof(m->m_pkthdr.ether_vtag), p)= ; > =A0 =A0 =A0 =A0} else if (etype =3D=3D ETHERTYPE_VLAN) { > - =A0 =A0 =A0 =A0 =A0 =A0 =A0 vlan =3D lagg_gethdr(m, off, =A0sizeof(*vla= n), &vlanbuf); > + =A0 =A0 =A0 =A0 =A0 =A0 =A0 vlan =3D lagg_gethdr(m, off, =A0sizeof(*vla= n), &buf); > =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0if (vlan =3D=3D NULL) > =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0goto out; > --=20 wbr, pluknet