Date: Sat, 30 Apr 2011 20:34:52 +0000 (UTC) From: Andrew Thompson <thompsa@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r221270 - head/sys/net Message-ID: <201104302034.p3UKYqOq061267@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: thompsa Date: Sat Apr 30 20:34:52 2011 New Revision: 221270 URL: http://svn.freebsd.org/changeset/base/221270 Log: LACP frames must not be send VLAN-tagged, check for that before processing. PR: kern/156743 Submitted by: Dmitrij Tejblum MFC after: 1 week Modified: head/sys/net/if_lagg.c Modified: head/sys/net/if_lagg.c ============================================================================== --- head/sys/net/if_lagg.c Sat Apr 30 20:16:49 2011 (r221269) +++ head/sys/net/if_lagg.c Sat Apr 30 20:34:52 2011 (r221270) @@ -1794,7 +1794,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?201104302034.p3UKYqOq061267>