From fc83a48265916a41c1402c6edcdfc62133937dce Mon Sep 17 00:00:00 2001 From: thompsa Date: Sat, 30 Apr 2011 20:34:52 +0000 Subject: LACP frames must not be send VLAN-tagged, check for that before processing. PR: kern/156743 Submitted by: Dmitrij Tejblum MFC after: 1 week --- sys/net/if_lagg.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'sys/net/if_lagg.c') diff --git a/sys/net/if_lagg.c b/sys/net/if_lagg.c index cbe9b99..2548c65 100644 --- a/sys/net/if_lagg.c +++ b/sys/net/if_lagg.c @@ -1794,7 +1794,7 @@ lagg_lacp_input(struct lagg_softc *sc, struct lagg_port *lp, struct mbuf *m) 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); -- cgit v1.1