Module Name: src
Committed By: ozaki-r
Date: Tue May 14 09:43:55 UTC 2019
Modified Files:
src/sys/dev/pci: if_wm.c
src/sys/dev/pci/ixgbe: ixgbe.c
Log Message:
Remove unnecessary checks of IFF_ALLMULTI
IFF_ALLMULTI is changed by only driver itself, so we don't need to check its
change on ec_ifflags_cb.
This is part of PR kern/54189. NFCI.
To generate a diff of this commit:
cvs rdiff -u -r1.634 -r1.635 src/sys/dev/pci/if_wm.c
cvs rdiff -u -r1.181 -r1.182 src/sys/dev/pci/ixgbe/ixgbe.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/pci/if_wm.c
diff -u src/sys/dev/pci/if_wm.c:1.634 src/sys/dev/pci/if_wm.c:1.635
--- src/sys/dev/pci/if_wm.c:1.634 Wed Apr 24 11:18:20 2019
+++ src/sys/dev/pci/if_wm.c Tue May 14 09:43:55 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: if_wm.c,v 1.634 2019/04/24 11:18:20 msaitoh Exp $ */
+/* $NetBSD: if_wm.c,v 1.635 2019/05/14 09:43:55 ozaki-r Exp $ */
/*
* Copyright (c) 2001, 2002, 2003, 2004 Wasabi Systems, Inc.
@@ -82,7 +82,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.634 2019/04/24 11:18:20 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.635 2019/05/14 09:43:55 ozaki-r Exp $");
#ifdef _KERNEL_OPT
#include "opt_net_mpsafe.h"
@@ -3319,7 +3319,7 @@ wm_ifflags_cb(struct ethercom *ec)
}
/* iff related updates */
- if ((iffchange & (IFF_PROMISC | IFF_ALLMULTI)) != 0)
+ if ((iffchange & IFF_PROMISC) != 0)
wm_set_filter(sc);
wm_set_vlan(sc);
Index: src/sys/dev/pci/ixgbe/ixgbe.c
diff -u src/sys/dev/pci/ixgbe/ixgbe.c:1.181 src/sys/dev/pci/ixgbe/ixgbe.c:1.182
--- src/sys/dev/pci/ixgbe/ixgbe.c:1.181 Mon May 13 05:04:17 2019
+++ src/sys/dev/pci/ixgbe/ixgbe.c Tue May 14 09:43:55 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: ixgbe.c,v 1.181 2019/05/13 05:04:17 msaitoh Exp $ */
+/* $NetBSD: ixgbe.c,v 1.182 2019/05/14 09:43:55 ozaki-r Exp $ */
/******************************************************************************
@@ -6163,7 +6163,7 @@ ixgbe_ifflags_cb(struct ethercom *ec)
if ((change & ~(IFF_CANTCHANGE | IFF_DEBUG)) != 0)
rc = ENETRESET;
- else if ((change & (IFF_PROMISC | IFF_ALLMULTI)) != 0)
+ else if ((change & IFF_PROMISC) != 0)
ixgbe_set_promisc(adapter);
/* Set up VLAN support and filter */
