summaryrefslogtreecommitdiff
path: root/sys/net/if_trunk.c
diff options
context:
space:
mode:
authorReyk Floeter <reyk@cvs.openbsd.org>2007-09-06 16:14:06 +0000
committerReyk Floeter <reyk@cvs.openbsd.org>2007-09-06 16:14:06 +0000
commit0e5c05ce601ae48cff8557b38d7b2b844599f6b5 (patch)
tree785b87bfc050151dca3789732b89392bcddb6a0a /sys/net/if_trunk.c
parent679f73e8e9175897a2a95db87d7198de96e9a176 (diff)
With a trunk(4) interface in fail over mode the trunk(4) interface
will show input errors for packets received from any of the ports that are part of a fail over interface but are not the "master" port at the time. This fixes the problem by checking the error condition correctly. From brad at comstyle dot com
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 2762e13256e..f4894f20cd4 100644
--- a/sys/net/if_trunk.c
+++ b/sys/net/if_trunk.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_trunk.c,v 1.32 2007/05/26 17:13:31 jason Exp $ */
+/* $OpenBSD: if_trunk.c,v 1.33 2007/09/06 16:14:05 reyk Exp $ */
/*
* Copyright (c) 2005, 2006 Reyk Floeter <reyk@openbsd.org>
@@ -1076,7 +1076,7 @@ trunk_input(struct ifnet *ifp, struct ether_header *eh, struct mbuf *m)
return (0);
bad:
- if (error && trifp != NULL)
+ if (error > 0 && trifp != NULL)
trifp->if_ierrors++;
return (error);
}