Module Name: src
Committed By: riastradh
Date: Thu Mar 3 05:53:33 UTC 2022
Modified Files:
src/sys/dev/usb: if_aue.c if_axe.c if_axen.c if_cue.c if_kue.c if_mos.c
if_mue.c if_smsc.c if_udav.c if_ure.c if_url.c
Log Message:
usbnet drivers: Omit redundant multicast filter update on init.
To generate a diff of this commit:
cvs rdiff -u -r1.181 -r1.182 src/sys/dev/usb/if_aue.c
cvs rdiff -u -r1.142 -r1.143 src/sys/dev/usb/if_axe.c
cvs rdiff -u -r1.84 -r1.85 src/sys/dev/usb/if_axen.c
cvs rdiff -u -r1.100 -r1.101 src/sys/dev/usb/if_cue.c
cvs rdiff -u -r1.113 -r1.114 src/sys/dev/usb/if_kue.c
cvs rdiff -u -r1.15 -r1.16 src/sys/dev/usb/if_mos.c
cvs rdiff -u -r1.73 -r1.74 src/sys/dev/usb/if_mue.c
cvs rdiff -u -r1.83 -r1.84 src/sys/dev/usb/if_smsc.c
cvs rdiff -u -r1.88 -r1.89 src/sys/dev/usb/if_udav.c src/sys/dev/usb/if_url.c
cvs rdiff -u -r1.49 -r1.50 src/sys/dev/usb/if_ure.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/usb/if_aue.c
diff -u src/sys/dev/usb/if_aue.c:1.181 src/sys/dev/usb/if_aue.c:1.182
--- src/sys/dev/usb/if_aue.c:1.181 Thu Mar 3 05:53:23 2022
+++ src/sys/dev/usb/if_aue.c Thu Mar 3 05:53:33 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: if_aue.c,v 1.181 2022/03/03 05:53:23 riastradh Exp $ */
+/* $NetBSD: if_aue.c,v 1.182 2022/03/03 05:53:33 riastradh Exp $ */
/*
* Copyright (c) 1997, 1998, 1999, 2000
@@ -76,7 +76,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_aue.c,v 1.181 2022/03/03 05:53:23 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_aue.c,v 1.182 2022/03/03 05:53:33 riastradh Exp $");
#ifdef _KERNEL_OPT
#include "opt_usb.h"
@@ -977,9 +977,6 @@ aue_uno_init(struct ifnet *ifp)
rv = usbnet_init_rx_tx(un);
- /* Load the multicast filter. */
- aue_uno_mcast(ifp);
-
/* Enable RX and TX */
aue_csr_write_1(sc, AUE_CTL0, AUE_CTL0_RXSTAT_APPEND | AUE_CTL0_RX_ENB);
AUE_SETBIT(sc, AUE_CTL0, AUE_CTL0_TX_ENB);
Index: src/sys/dev/usb/if_axe.c
diff -u src/sys/dev/usb/if_axe.c:1.142 src/sys/dev/usb/if_axe.c:1.143
--- src/sys/dev/usb/if_axe.c:1.142 Thu Mar 3 05:53:23 2022
+++ src/sys/dev/usb/if_axe.c Thu Mar 3 05:53:33 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: if_axe.c,v 1.142 2022/03/03 05:53:23 riastradh Exp $ */
+/* $NetBSD: if_axe.c,v 1.143 2022/03/03 05:53:33 riastradh Exp $ */
/* $OpenBSD: if_axe.c,v 1.137 2016/04/13 11:03:37 mpi Exp $ */
/*
@@ -87,7 +87,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_axe.c,v 1.142 2022/03/03 05:53:23 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_axe.c,v 1.143 2022/03/03 05:53:33 riastradh Exp $");
#ifdef _KERNEL_OPT
#include "opt_usb.h"
@@ -1298,9 +1298,6 @@ axe_uno_init(struct ifnet *ifp)
axe_cmd(sc, AXE_CMD_RXCTL_WRITE, 0, rxmode, NULL);
- /* Accept multicast frame or run promisc. mode */
- axe_uno_mcast(ifp);
-
return usbnet_init_rx_tx(un);
}
Index: src/sys/dev/usb/if_axen.c
diff -u src/sys/dev/usb/if_axen.c:1.84 src/sys/dev/usb/if_axen.c:1.85
--- src/sys/dev/usb/if_axen.c:1.84 Thu Mar 3 05:53:23 2022
+++ src/sys/dev/usb/if_axen.c Thu Mar 3 05:53:33 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: if_axen.c,v 1.84 2022/03/03 05:53:23 riastradh Exp $ */
+/* $NetBSD: if_axen.c,v 1.85 2022/03/03 05:53:33 riastradh Exp $ */
/* $OpenBSD: if_axen.c,v 1.3 2013/10/21 10:10:22 yuo Exp $ */
/*
@@ -23,7 +23,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_axen.c,v 1.84 2022/03/03 05:53:23 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_axen.c,v 1.85 2022/03/03 05:53:33 riastradh Exp $");
#ifdef _KERNEL_OPT
#include "opt_usb.h"
@@ -903,9 +903,6 @@ axen_uno_init(struct ifnet *ifp)
/* Configure offloading engine. */
axen_setoe_locked(un);
- /* Program promiscuous mode and multicast filters. */
- axen_uno_mcast(ifp);
-
/* Enable receiver, set RX mode */
axen_cmd(un, AXEN_CMD_MAC_READ2, 2, AXEN_MAC_RXCTL, &wval);
rxmode = le16toh(wval);
Index: src/sys/dev/usb/if_cue.c
diff -u src/sys/dev/usb/if_cue.c:1.100 src/sys/dev/usb/if_cue.c:1.101
--- src/sys/dev/usb/if_cue.c:1.100 Thu Mar 3 05:53:14 2022
+++ src/sys/dev/usb/if_cue.c Thu Mar 3 05:53:33 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: if_cue.c,v 1.100 2022/03/03 05:53:14 riastradh Exp $ */
+/* $NetBSD: if_cue.c,v 1.101 2022/03/03 05:53:33 riastradh Exp $ */
/*
* Copyright (c) 1997, 1998, 1999, 2000
@@ -57,7 +57,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_cue.c,v 1.100 2022/03/03 05:53:14 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_cue.c,v 1.101 2022/03/03 05:53:33 riastradh Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -647,9 +647,6 @@ cue_uno_init(struct ifnet *ifp)
ctl |= CUE_ETHCTL_PROMISC;
cue_csr_write_1(un, CUE_ETHCTL, ctl);
- /* Load the multicast filter. */
- cue_uno_mcast(ifp);
-
/*
* Set the number of RX and TX buffers that we want
* to reserve inside the ASIC.
Index: src/sys/dev/usb/if_kue.c
diff -u src/sys/dev/usb/if_kue.c:1.113 src/sys/dev/usb/if_kue.c:1.114
--- src/sys/dev/usb/if_kue.c:1.113 Thu Mar 3 05:53:14 2022
+++ src/sys/dev/usb/if_kue.c Thu Mar 3 05:53:33 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: if_kue.c,v 1.113 2022/03/03 05:53:14 riastradh Exp $ */
+/* $NetBSD: if_kue.c,v 1.114 2022/03/03 05:53:33 riastradh Exp $ */
/*
* Copyright (c) 1997, 1998, 1999, 2000
@@ -71,7 +71,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_kue.c,v 1.113 2022/03/03 05:53:14 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_kue.c,v 1.114 2022/03/03 05:53:33 riastradh Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -621,9 +621,6 @@ kue_uno_init(struct ifnet *ifp)
#endif
kue_setword(un, KUE_CMD_SET_URB_SIZE, 64);
- /* Load the multicast filter. */
- kue_uno_mcast(ifp);
-
return usbnet_init_rx_tx(un);
}
Index: src/sys/dev/usb/if_mos.c
diff -u src/sys/dev/usb/if_mos.c:1.15 src/sys/dev/usb/if_mos.c:1.16
--- src/sys/dev/usb/if_mos.c:1.15 Thu Mar 3 05:53:04 2022
+++ src/sys/dev/usb/if_mos.c Thu Mar 3 05:53:33 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: if_mos.c,v 1.15 2022/03/03 05:53:04 riastradh Exp $ */
+/* $NetBSD: if_mos.c,v 1.16 2022/03/03 05:53:33 riastradh Exp $ */
/* $OpenBSD: if_mos.c,v 1.40 2019/07/07 06:40:10 kevlo Exp $ */
/*
@@ -72,7 +72,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_mos.c,v 1.15 2022/03/03 05:53:04 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_mos.c,v 1.16 2022/03/03 05:53:33 riastradh Exp $");
#include <sys/param.h>
@@ -747,9 +747,6 @@ mos_uno_init(struct ifnet *ifp)
mos_reg_write_1(un, MOS_IPG0, ipgs[0]);
mos_reg_write_1(un, MOS_IPG1, ipgs[1]);
- /* Accept multicast frame or run promisc. mode */
- mos_uno_mcast(ifp);
-
/* Enable receiver and transmitter, bridge controls speed/duplex mode */
rxmode = mos_reg_read_1(un, MOS_CTL);
rxmode |= MOS_CTL_RX_ENB | MOS_CTL_TX_ENB | MOS_CTL_BS_ENB;
Index: src/sys/dev/usb/if_mue.c
diff -u src/sys/dev/usb/if_mue.c:1.73 src/sys/dev/usb/if_mue.c:1.74
--- src/sys/dev/usb/if_mue.c:1.73 Thu Mar 3 05:53:14 2022
+++ src/sys/dev/usb/if_mue.c Thu Mar 3 05:53:33 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: if_mue.c,v 1.73 2022/03/03 05:53:14 riastradh Exp $ */
+/* $NetBSD: if_mue.c,v 1.74 2022/03/03 05:53:33 riastradh Exp $ */
/* $OpenBSD: if_mue.c,v 1.3 2018/08/04 16:42:46 jsg Exp $ */
/*
@@ -20,7 +20,7 @@
/* Driver for Microchip LAN7500/LAN7800 chipsets. */
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_mue.c,v 1.73 2022/03/03 05:53:14 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_mue.c,v 1.74 2022/03/03 05:53:33 riastradh Exp $");
#ifdef _KERNEL_OPT
#include "opt_usb.h"
@@ -1239,9 +1239,6 @@ mue_uno_init(struct ifnet *ifp)
/* Set MAC address. */
mue_set_macaddr(un);
- /* Load the multicast filter. */
- mue_uno_mcast(ifp);
-
/* TCP/UDP checksum offload engines. */
mue_sethwcsum_locked(un);
Index: src/sys/dev/usb/if_smsc.c
diff -u src/sys/dev/usb/if_smsc.c:1.83 src/sys/dev/usb/if_smsc.c:1.84
--- src/sys/dev/usb/if_smsc.c:1.83 Thu Mar 3 05:53:23 2022
+++ src/sys/dev/usb/if_smsc.c Thu Mar 3 05:53:33 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: if_smsc.c,v 1.83 2022/03/03 05:53:23 riastradh Exp $ */
+/* $NetBSD: if_smsc.c,v 1.84 2022/03/03 05:53:33 riastradh Exp $ */
/* $OpenBSD: if_smsc.c,v 1.4 2012/09/27 12:38:11 jsg Exp $ */
/* $FreeBSD: src/sys/dev/usb/net/if_smsc.c,v 1.1 2012/08/15 04:03:55 gonzo Exp $ */
@@ -61,7 +61,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_smsc.c,v 1.83 2022/03/03 05:53:23 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_smsc.c,v 1.84 2022/03/03 05:53:33 riastradh Exp $");
#ifdef _KERNEL_OPT
#include "opt_usb.h"
@@ -563,9 +563,6 @@ smsc_uno_init(struct ifnet *ifp)
/* Reset the ethernet interface. */
smsc_reset(sc);
- /* Load the multicast filter. */
- smsc_uno_mcast(ifp);
-
/* TCP/UDP checksum offload engines. */
smsc_setoe_locked(un);
Index: src/sys/dev/usb/if_udav.c
diff -u src/sys/dev/usb/if_udav.c:1.88 src/sys/dev/usb/if_udav.c:1.89
--- src/sys/dev/usb/if_udav.c:1.88 Thu Mar 3 05:53:23 2022
+++ src/sys/dev/usb/if_udav.c Thu Mar 3 05:53:33 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: if_udav.c,v 1.88 2022/03/03 05:53:23 riastradh Exp $ */
+/* $NetBSD: if_udav.c,v 1.89 2022/03/03 05:53:33 riastradh Exp $ */
/* $nabe: if_udav.c,v 1.3 2003/08/21 16:57:19 nabe Exp $ */
/*
@@ -45,7 +45,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_udav.c,v 1.88 2022/03/03 05:53:23 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_udav.c,v 1.89 2022/03/03 05:53:33 riastradh Exp $");
#ifdef _KERNEL_OPT
#include "opt_usb.h"
@@ -494,9 +494,6 @@ udav_uno_init(struct ifnet *ifp)
else
UDAV_CLRBIT(un, UDAV_RCR, UDAV_RCR_ALL | UDAV_RCR_PRMSC);
- /* Load the multicast filter */
- udav_uno_mcast(ifp);
-
/* Enable RX */
UDAV_SETBIT(un, UDAV_RCR, UDAV_RCR_RXEN);
Index: src/sys/dev/usb/if_url.c
diff -u src/sys/dev/usb/if_url.c:1.88 src/sys/dev/usb/if_url.c:1.89
--- src/sys/dev/usb/if_url.c:1.88 Thu Mar 3 05:53:23 2022
+++ src/sys/dev/usb/if_url.c Thu Mar 3 05:53:33 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: if_url.c,v 1.88 2022/03/03 05:53:23 riastradh Exp $ */
+/* $NetBSD: if_url.c,v 1.89 2022/03/03 05:53:33 riastradh Exp $ */
/*
* Copyright (c) 2001, 2002
@@ -44,7 +44,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_url.c,v 1.88 2022/03/03 05:53:23 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_url.c,v 1.89 2022/03/03 05:53:33 riastradh Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -389,9 +389,6 @@ url_uno_init(struct ifnet *ifp)
/* Init receive control register */
URL_SETBIT2(un, URL_RCR, URL_RCR_TAIL | URL_RCR_AD | URL_RCR_AB);
- /* Accept multicast frame or run promisc. mode */
- url_uno_mcast(ifp);
-
/* Enable RX and TX */
URL_SETBIT(un, URL_CR, URL_CR_TE | URL_CR_RE);
Index: src/sys/dev/usb/if_ure.c
diff -u src/sys/dev/usb/if_ure.c:1.49 src/sys/dev/usb/if_ure.c:1.50
--- src/sys/dev/usb/if_ure.c:1.49 Thu Mar 3 05:53:23 2022
+++ src/sys/dev/usb/if_ure.c Thu Mar 3 05:53:33 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: if_ure.c,v 1.49 2022/03/03 05:53:23 riastradh Exp $ */
+/* $NetBSD: if_ure.c,v 1.50 2022/03/03 05:53:33 riastradh Exp $ */
/* $OpenBSD: if_ure.c,v 1.10 2018/11/02 21:32:30 jcs Exp $ */
/*-
@@ -30,7 +30,7 @@
/* RealTek RTL8152/RTL8153 10/100/Gigabit USB Ethernet device */
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_ure.c,v 1.49 2022/03/03 05:53:23 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ure.c,v 1.50 2022/03/03 05:53:33 riastradh Exp $");
#ifdef _KERNEL_OPT
#include "opt_usb.h"
@@ -445,9 +445,6 @@ ure_uno_init(struct ifnet *ifp)
ure_read_2(un, URE_PLA_MISC_1, URE_MCU_TYPE_PLA) &
~URE_RXDY_GATED_EN);
- /* Accept multicast frame or run promisc. mode. */
- ure_uno_mcast(ifp);
-
return usbnet_init_rx_tx(un);
}
