Module Name: src
Committed By: jakllsch
Date: Wed Mar 30 17:52:45 UTC 2011
Modified Files:
src/sys/dev/ic: i82557.c
Log Message:
IFF_PROMISC implys IFF_ALLMULTI.
Should fix PR#43186.
To generate a diff of this commit:
cvs rdiff -u -r1.136 -r1.137 src/sys/dev/ic/i82557.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/ic/i82557.c
diff -u src/sys/dev/ic/i82557.c:1.136 src/sys/dev/ic/i82557.c:1.137
--- src/sys/dev/ic/i82557.c:1.136 Sat Nov 13 08:55:13 2010
+++ src/sys/dev/ic/i82557.c Wed Mar 30 17:52:45 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: i82557.c,v 1.136 2010/11/13 08:55:13 uebayasi Exp $ */
+/* $NetBSD: i82557.c,v 1.137 2011/03/30 17:52:45 jakllsch Exp $ */
/*-
* Copyright (c) 1997, 1998, 1999, 2001, 2002 The NetBSD Foundation, Inc.
@@ -66,7 +66,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: i82557.c,v 1.136 2010/11/13 08:55:13 uebayasi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: i82557.c,v 1.137 2011/03/30 17:52:45 jakllsch Exp $");
#include "rnd.h"
@@ -2237,7 +2237,13 @@
panic("fxp_mc_setup: pending transmissions");
#endif
- ifp->if_flags &= ~IFF_ALLMULTI;
+
+ if (ifp->if_flags & IFF_PROMISC) {
+ ifp->if_flags |= IFF_ALLMULTI;
+ return;
+ } else {
+ ifp->if_flags &= ~IFF_ALLMULTI;
+ }
/*
* Initialize multicast setup descriptor.
