Date: Tue, 10 May 2011 02:58:08 +0000 (UTC) From: Andrew Thompson <thompsa@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org Subject: svn commit: r221721 - stable/8/sys/net Message-ID: <201105100258.p4A2w8am023609@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: thompsa Date: Tue May 10 02:58:08 2011 New Revision: 221721 URL: http://svn.freebsd.org/changeset/base/221721 Log: MFC r221270 LACP frames must not be send VLAN-tagged, check for that before processing. PR: kern/156743 Submitted by: Dmitrij Tejblum Modified: stable/8/sys/net/if_lagg.c Directory Properties: stable/8/sys/ (props changed) stable/8/sys/amd64/include/xen/ (props changed) stable/8/sys/cddl/contrib/opensolaris/ (props changed) stable/8/sys/contrib/dev/acpica/ (props changed) stable/8/sys/contrib/pf/ (props changed) Modified: stable/8/sys/net/if_lagg.c ============================================================================== --- stable/8/sys/net/if_lagg.c Tue May 10 02:38:44 2011 (r221720) +++ stable/8/sys/net/if_lagg.c Tue May 10 02:58:08 2011 (r221721) @@ -1786,7 +1786,7 @@ lagg_lacp_input(struct lagg_softc *sc, s etype = ntohs(eh->ether_type); /* Tap off LACP control messages */ - if (etype == ETHERTYPE_SLOW) { + if ((m->m_flags & M_VLANTAG) == 0 && etype == ETHERTYPE_SLOW) { m = lacp_input(lp, m); if (m == NULL) return (NULL);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201105100258.p4A2w8am023609>