summaryrefslogtreecommitdiff
path: root/sys/net/if_trunk.c
diff options
context:
space:
mode:
authorMarco Pfatschbacher <mpf@cvs.openbsd.org>2008-11-08 01:00:02 +0000
committerMarco Pfatschbacher <mpf@cvs.openbsd.org>2008-11-08 01:00:02 +0000
commit110070b785df9e67a94b00788cfd4c22e202ada0 (patch)
tree95973cfbc1e77ef259faf74ede61d9e92f008434 /sys/net/if_trunk.c
parent9d594ad3960f203a99672bae0398bdcdf497711f (diff)
Take into account that our ether_input() already strips the
ethernet header. This lets us actually process the incoming LACP-Packets. It should now work with a lot more switches. At least a Catalyst 3500 seems happy. OK brad@
Diffstat (limited to 'sys/net/if_trunk.c')
-rw-r--r--sys/net/if_trunk.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/net/if_trunk.c b/sys/net/if_trunk.c
index faa2ebf92ed..47c87a80d5d 100644
--- a/sys/net/if_trunk.c
+++ b/sys/net/if_trunk.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_trunk.c,v 1.58 2008/11/04 13:44:11 brad Exp $ */
+/* $OpenBSD: if_trunk.c,v 1.59 2008/11/08 01:00:01 mpf Exp $ */
/*
* Copyright (c) 2005, 2006, 2007 Reyk Floeter <reyk@openbsd.org>
@@ -1638,7 +1638,7 @@ trunk_lacp_input(struct trunk_softc *tr, struct trunk_port *tp,
/* Tap off LACP control messages */
if (etype == ETHERTYPE_SLOW) {
- m = lacp_input(tp, m);
+ m = lacp_input(tp, eh, m);
if (m == NULL)
return (-1);
}