Module Name: src
Committed By: martin
Date: Mon May 13 12:40:13 UTC 2019
Modified Files:
src/sys/arch/arm/imx [netbsd-8]: if_enet.c
src/sys/arch/mips/adm5120/dev [netbsd-8]: if_admsw.c
src/sys/dev/mii [netbsd-8]: brgphy.c ciphy.c rgephy.c
src/sys/dev/pci [netbsd-8]: if_bge.c if_bnx.c if_et.c if_lii.c if_msk.c
if_nfe.c if_sk.c if_ti.c if_txp.c if_vge.c
src/sys/dev/usb [netbsd-8]: if_aue.c if_axen.c
Log Message:
Pull up the following, via patch, requested by msaitoh in ticket #1263:
sys/dev/mii/brgphy.c 1.84
sys/dev/mii/ciphy.c 1.33 via patch
sys/dev/mii/rgephy.c 1.53
sys/arch/arm/imx/if_enet.c 1.18
sys/arch/mips/adm5120/dev/if_admsw.c 1.19-1.20
sys/dev/pci/if_bge.c 1.329
sys/dev/pci/if_bnx.c 1.81
sys/dev/pci/if_et.c 1.21
sys/dev/pci/if_lii.c 1.22
sys/dev/pci/if_msk.c 1.87
sys/dev/pci/if_nfe.c 1.68
sys/dev/pci/if_sk.c 1.95
sys/dev/pci/if_ti.c 1.107
sys/dev/pci/if_txp.c 1.52
sys/dev/pci/if_vge.c 1.69
sys/dev/usb/if_axen.c 1.38
sys/dev/usb/if_aue.c 1.149
Fix a bug that the duplex of manual media setting may be wrong
when the IFM_GMASK bit other than IFM_[FH]DX is set.
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.10.8.1 src/sys/arch/arm/imx/if_enet.c
cvs rdiff -u -r1.16 -r1.16.8.1 src/sys/arch/mips/adm5120/dev/if_admsw.c
cvs rdiff -u -r1.76.20.1 -r1.76.20.2 src/sys/dev/mii/brgphy.c
cvs rdiff -u -r1.26 -r1.26.10.1 src/sys/dev/mii/ciphy.c
cvs rdiff -u -r1.40.10.1 -r1.40.10.2 src/sys/dev/mii/rgephy.c
cvs rdiff -u -r1.310.2.6 -r1.310.2.7 src/sys/dev/pci/if_bge.c
cvs rdiff -u -r1.61.8.2 -r1.61.8.3 src/sys/dev/pci/if_bnx.c
cvs rdiff -u -r1.14.8.1 -r1.14.8.2 src/sys/dev/pci/if_et.c
cvs rdiff -u -r1.17 -r1.17.8.1 src/sys/dev/pci/if_lii.c
cvs rdiff -u -r1.54.8.1 -r1.54.8.2 src/sys/dev/pci/if_msk.c
cvs rdiff -u -r1.63.8.1 -r1.63.8.2 src/sys/dev/pci/if_nfe.c
cvs rdiff -u -r1.85 -r1.85.8.1 src/sys/dev/pci/if_sk.c
cvs rdiff -u -r1.101.8.1 -r1.101.8.2 src/sys/dev/pci/if_ti.c
cvs rdiff -u -r1.47.8.1 -r1.47.8.2 src/sys/dev/pci/if_txp.c
cvs rdiff -u -r1.60.8.1 -r1.60.8.2 src/sys/dev/pci/if_vge.c
cvs rdiff -u -r1.141.8.3 -r1.141.8.4 src/sys/dev/usb/if_aue.c
cvs rdiff -u -r1.11.8.7 -r1.11.8.8 src/sys/dev/usb/if_axen.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/arch/arm/imx/if_enet.c
diff -u src/sys/arch/arm/imx/if_enet.c:1.10 src/sys/arch/arm/imx/if_enet.c:1.10.8.1
--- src/sys/arch/arm/imx/if_enet.c:1.10 Thu Dec 15 09:28:02 2016
+++ src/sys/arch/arm/imx/if_enet.c Mon May 13 12:40:13 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: if_enet.c,v 1.10 2016/12/15 09:28:02 ozaki-r Exp $ */
+/* $NetBSD: if_enet.c,v 1.10.8.1 2019/05/13 12:40:13 martin Exp $ */
/*
* Copyright (c) 2014 Ryo Shimizu <r...@nerv.org>
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_enet.c,v 1.10 2016/12/15 09:28:02 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_enet.c,v 1.10.8.1 2019/05/13 12:40:13 martin Exp $");
#include "vlan.h"
@@ -1166,7 +1166,7 @@ enet_miibus_statchg(struct ifnet *ifp)
mii->mii_media_active &= ~IFM_ETH_FMASK;
}
- if ((ife->ifm_media & IFM_GMASK) == IFM_FDX) {
+ if ((ife->ifm_media & IFM_FDX) != 0) {
tcr |= ENET_TCR_FDEN; /* full duplex */
rcr &= ~ENET_RCR_DRT;; /* enable receive on transmit */
} else {
@@ -1776,7 +1776,7 @@ enet_init_regs(struct enet_softc *sc, in
mii = &sc->sc_mii;
ife = mii->mii_media.ifm_cur;
- if ((ife->ifm_media & IFM_GMASK) == IFM_FDX)
+ if ((ife->ifm_media & IFM_FDX) != 0)
fulldup = 1;
else
fulldup = 0;
Index: src/sys/arch/mips/adm5120/dev/if_admsw.c
diff -u src/sys/arch/mips/adm5120/dev/if_admsw.c:1.16 src/sys/arch/mips/adm5120/dev/if_admsw.c:1.16.8.1
--- src/sys/arch/mips/adm5120/dev/if_admsw.c:1.16 Thu Dec 15 09:28:03 2016
+++ src/sys/arch/mips/adm5120/dev/if_admsw.c Mon May 13 12:40:13 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: if_admsw.c,v 1.16 2016/12/15 09:28:03 ozaki-r Exp $ */
+/* $NetBSD: if_admsw.c,v 1.16.8.1 2019/05/13 12:40:13 martin Exp $ */
/*-
* Copyright (c) 2007 Ruslan Ermilov and Vsevolod Lobko.
@@ -76,7 +76,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_admsw.c,v 1.16 2016/12/15 09:28:03 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_admsw.c,v 1.16.8.1 2019/05/13 12:40:13 martin Exp $");
#include <sys/param.h>
@@ -1232,12 +1232,12 @@ admsw_mediachange(struct ifnet *ifp)
if (IFM_SUBTYPE(ifm->ifm_media) == IFM_AUTO) {
val = PHY_CNTL2_AUTONEG|PHY_CNTL2_100M|PHY_CNTL2_FDX;
} else if (IFM_SUBTYPE(ifm->ifm_media) == IFM_100_TX) {
- if ((ifm->ifm_media & IFM_GMASK) == IFM_FDX)
+ if ((ifm->ifm_media & IFM_FDX) != 0)
val = PHY_CNTL2_100M|PHY_CNTL2_FDX;
else
val = PHY_CNTL2_100M;
} else if (IFM_SUBTYPE(ifm->ifm_media) == IFM_10_T) {
- if ((ifm->ifm_media & IFM_GMASK) == IFM_FDX)
+ if ((ifm->ifm_media & IFM_FDX) != 0)
val = PHY_CNTL2_FDX;
else
val = 0;
Index: src/sys/dev/mii/brgphy.c
diff -u src/sys/dev/mii/brgphy.c:1.76.20.1 src/sys/dev/mii/brgphy.c:1.76.20.2
--- src/sys/dev/mii/brgphy.c:1.76.20.1 Thu Mar 7 17:22:19 2019
+++ src/sys/dev/mii/brgphy.c Mon May 13 12:40:13 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: brgphy.c,v 1.76.20.1 2019/03/07 17:22:19 martin Exp $ */
+/* $NetBSD: brgphy.c,v 1.76.20.2 2019/05/13 12:40:13 martin Exp $ */
/*-
* Copyright (c) 1998, 1999, 2000, 2001 The NetBSD Foundation, Inc.
@@ -62,7 +62,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: brgphy.c,v 1.76.20.1 2019/03/07 17:22:19 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: brgphy.c,v 1.76.20.2 2019/05/13 12:40:13 martin Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -423,7 +423,7 @@ brgphy_service(struct mii_softc *sc, str
speed = BMCR_S10;
setit:
brgphy_loop(sc);
- if ((ife->ifm_media & IFM_GMASK) == IFM_FDX) {
+ if ((ife->ifm_media & IFM_FDX) != 0) {
speed |= BMCR_FDX;
gig = GTCR_ADV_1000TFDX;
} else
Index: src/sys/dev/mii/ciphy.c
diff -u src/sys/dev/mii/ciphy.c:1.26 src/sys/dev/mii/ciphy.c:1.26.10.1
--- src/sys/dev/mii/ciphy.c:1.26 Thu Jul 7 06:55:41 2016
+++ src/sys/dev/mii/ciphy.c Mon May 13 12:40:13 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: ciphy.c,v 1.26 2016/07/07 06:55:41 msaitoh Exp $ */
+/* $NetBSD: ciphy.c,v 1.26.10.1 2019/05/13 12:40:13 martin Exp $ */
/*-
* Copyright (c) 2004
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ciphy.c,v 1.26 2016/07/07 06:55:41 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ciphy.c,v 1.26.10.1 2019/05/13 12:40:13 martin Exp $");
/*
* Driver for the Cicada CS8201 10/100/1000 copper PHY.
@@ -197,7 +197,7 @@ ciphy_service(struct mii_softc *sc, stru
case IFM_10_T:
speed = CIPHY_S10;
setit:
- if ((ife->ifm_media & IFM_GMASK) == IFM_FDX) {
+ if ((ife->ifm_media & IFM_FDX) != 0) {
speed |= CIPHY_BMCR_FDX;
gig = CIPHY_1000CTL_AFD;
} else {
Index: src/sys/dev/mii/rgephy.c
diff -u src/sys/dev/mii/rgephy.c:1.40.10.1 src/sys/dev/mii/rgephy.c:1.40.10.2
--- src/sys/dev/mii/rgephy.c:1.40.10.1 Thu Jan 31 05:59:55 2019
+++ src/sys/dev/mii/rgephy.c Mon May 13 12:40:13 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: rgephy.c,v 1.40.10.1 2019/01/31 05:59:55 martin Exp $ */
+/* $NetBSD: rgephy.c,v 1.40.10.2 2019/05/13 12:40:13 martin Exp $ */
/*
* Copyright (c) 2003
@@ -33,7 +33,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rgephy.c,v 1.40.10.1 2019/01/31 05:59:55 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rgephy.c,v 1.40.10.2 2019/05/13 12:40:13 martin Exp $");
/*
@@ -229,7 +229,7 @@ rgephy_service(struct mii_softc *sc, str
anar |= ANAR_10_FD | ANAR_10;
setit:
rgephy_loop(sc);
- if ((ife->ifm_media & IFM_GMASK) == IFM_FDX) {
+ if ((ife->ifm_media & IFM_FDX) != 0) {
speed |= BMCR_FDX;
gig = GTCR_ADV_1000TFDX;
anar &= ~(ANAR_TX | ANAR_10);
Index: src/sys/dev/pci/if_bge.c
diff -u src/sys/dev/pci/if_bge.c:1.310.2.6 src/sys/dev/pci/if_bge.c:1.310.2.7
--- src/sys/dev/pci/if_bge.c:1.310.2.6 Sun Apr 7 13:46:39 2019
+++ src/sys/dev/pci/if_bge.c Mon May 13 12:40:13 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: if_bge.c,v 1.310.2.6 2019/04/07 13:46:39 martin Exp $ */
+/* $NetBSD: if_bge.c,v 1.310.2.7 2019/05/13 12:40:13 martin Exp $ */
/*
* Copyright (c) 2001 Wind River Systems
@@ -79,7 +79,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_bge.c,v 1.310.2.6 2019/04/07 13:46:39 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_bge.c,v 1.310.2.7 2019/05/13 12:40:13 martin Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -5679,7 +5679,7 @@ bge_ifmedia_upd(struct ifnet *ifp)
}
break;
case IFM_1000_SX:
- if ((ifm->ifm_media & IFM_GMASK) == IFM_FDX) {
+ if ((ifm->ifm_media & IFM_FDX) != 0) {
BGE_CLRBIT(sc, BGE_MAC_MODE,
BGE_MACMODE_HALF_DUPLEX);
} else {
Index: src/sys/dev/pci/if_bnx.c
diff -u src/sys/dev/pci/if_bnx.c:1.61.8.2 src/sys/dev/pci/if_bnx.c:1.61.8.3
--- src/sys/dev/pci/if_bnx.c:1.61.8.2 Wed May 9 14:52:40 2018
+++ src/sys/dev/pci/if_bnx.c Mon May 13 12:40:13 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: if_bnx.c,v 1.61.8.2 2018/05/09 14:52:40 martin Exp $ */
+/* $NetBSD: if_bnx.c,v 1.61.8.3 2019/05/13 12:40:13 martin Exp $ */
/* $OpenBSD: if_bnx.c,v 1.85 2009/11/09 14:32:41 dlg Exp $ */
/*-
@@ -35,7 +35,7 @@
#if 0
__FBSDID("$FreeBSD: src/sys/dev/bce/if_bce.c,v 1.3 2006/04/13 14:12:26 ru Exp $");
#endif
-__KERNEL_RCSID(0, "$NetBSD: if_bnx.c,v 1.61.8.2 2018/05/09 14:52:40 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_bnx.c,v 1.61.8.3 2019/05/13 12:40:13 martin Exp $");
/*
* The following controllers are supported by this driver:
@@ -1223,7 +1223,7 @@ bnx_miibus_statchg(struct ifnet *ifp)
/* Set half or full duplex based on the duplicity
* negotiated by the PHY.
*/
- if ((mii->mii_media_active & IFM_GMASK) == IFM_HDX) {
+ if ((mii->mii_media_active & IFM_HDX) != 0) {
DBPRINT(sc, BNX_INFO, "Setting Half-Duplex interface.\n");
val |= BNX_EMAC_MODE_HALF_DUPLEX;
} else {
Index: src/sys/dev/pci/if_et.c
diff -u src/sys/dev/pci/if_et.c:1.14.8.1 src/sys/dev/pci/if_et.c:1.14.8.2
--- src/sys/dev/pci/if_et.c:1.14.8.1 Sat Aug 5 04:36:56 2017
+++ src/sys/dev/pci/if_et.c Mon May 13 12:40:13 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: if_et.c,v 1.14.8.1 2017/08/05 04:36:56 snj Exp $ */
+/* $NetBSD: if_et.c,v 1.14.8.2 2019/05/13 12:40:13 martin Exp $ */
/* $OpenBSD: if_et.c,v 1.11 2008/06/08 06:18:07 jsg Exp $ */
/*
* Copyright (c) 2007 The DragonFly Project. All rights reserved.
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_et.c,v 1.14.8.1 2017/08/05 04:36:56 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_et.c,v 1.14.8.2 2019/05/13 12:40:13 martin Exp $");
#include "opt_inet.h"
#include "vlan.h"
@@ -461,7 +461,7 @@ et_miibus_statchg(struct ifnet *ifp)
ctrl |= ET_MAC_CTRL_MODE_MII;
}
- if ((mii->mii_media_active & IFM_GMASK) == IFM_FDX)
+ if ((mii->mii_media_active & IFM_FDX) != 0)
cfg2 |= ET_MAC_CFG2_FDX;
else
ctrl |= ET_MAC_CTRL_GHDX;
Index: src/sys/dev/pci/if_lii.c
diff -u src/sys/dev/pci/if_lii.c:1.17 src/sys/dev/pci/if_lii.c:1.17.8.1
--- src/sys/dev/pci/if_lii.c:1.17 Thu Dec 15 09:28:05 2016
+++ src/sys/dev/pci/if_lii.c Mon May 13 12:40:13 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: if_lii.c,v 1.17 2016/12/15 09:28:05 ozaki-r Exp $ */
+/* $NetBSD: if_lii.c,v 1.17.8.1 2019/05/13 12:40:13 martin Exp $ */
/*
* Copyright (c) 2008 The NetBSD Foundation.
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_lii.c,v 1.17 2016/12/15 09:28:05 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_lii.c,v 1.17.8.1 2019/05/13 12:40:13 martin Exp $");
#include <sys/param.h>
@@ -646,7 +646,7 @@ lii_mii_statchg(struct ifnet *ifp)
val = AT_READ_4(sc, ATL2_MACC);
- if ((sc->sc_mii.mii_media_active & IFM_GMASK) == IFM_FDX)
+ if ((sc->sc_mii.mii_media_active & IFM_FDX) != 0)
val |= MACC_FDX;
else
val &= ~MACC_FDX;
Index: src/sys/dev/pci/if_msk.c
diff -u src/sys/dev/pci/if_msk.c:1.54.8.1 src/sys/dev/pci/if_msk.c:1.54.8.2
--- src/sys/dev/pci/if_msk.c:1.54.8.1 Thu Mar 8 14:31:18 2018
+++ src/sys/dev/pci/if_msk.c Mon May 13 12:40:13 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: if_msk.c,v 1.54.8.1 2018/03/08 14:31:18 martin Exp $ */
+/* $NetBSD: if_msk.c,v 1.54.8.2 2019/05/13 12:40:13 martin Exp $ */
/* $OpenBSD: if_msk.c,v 1.42 2007/01/17 02:43:02 krw Exp $ */
/*
@@ -52,7 +52,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_msk.c,v 1.54.8.1 2018/03/08 14:31:18 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_msk.c,v 1.54.8.2 2019/05/13 12:40:13 martin Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -303,7 +303,7 @@ msk_miibus_statchg(struct ifnet *ifp)
/* Set duplex. */
gpcr |= YU_GPCR_DPLX_DIS;
- if ((mii->mii_media_active & IFM_GMASK) == IFM_FDX)
+ if ((mii->mii_media_active & IFM_FDX) != 0)
gpcr |= YU_GPCR_DUPLEX;
/* Disable flow control. */
Index: src/sys/dev/pci/if_nfe.c
diff -u src/sys/dev/pci/if_nfe.c:1.63.8.1 src/sys/dev/pci/if_nfe.c:1.63.8.2
--- src/sys/dev/pci/if_nfe.c:1.63.8.1 Tue Oct 24 08:38:59 2017
+++ src/sys/dev/pci/if_nfe.c Mon May 13 12:40:13 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: if_nfe.c,v 1.63.8.1 2017/10/24 08:38:59 snj Exp $ */
+/* $NetBSD: if_nfe.c,v 1.63.8.2 2019/05/13 12:40:13 martin Exp $ */
/* $OpenBSD: if_nfe.c,v 1.77 2008/02/05 16:52:50 brad Exp $ */
/*-
@@ -21,7 +21,7 @@
/* Driver for NVIDIA nForce MCP Fast Ethernet and Gigabit Ethernet */
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_nfe.c,v 1.63.8.1 2017/10/24 08:38:59 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_nfe.c,v 1.63.8.2 2019/05/13 12:40:13 martin Exp $");
#include "opt_inet.h"
#include "vlan.h"
@@ -493,7 +493,7 @@ nfe_miibus_statchg(struct ifnet *ifp)
seed = NFE_READ(sc, NFE_RNDSEED);
seed &= ~NFE_SEED_MASK;
- if ((mii->mii_media_active & IFM_GMASK) == IFM_HDX) {
+ if ((mii->mii_media_active & IFM_HDX) != 0) {
phy |= NFE_PHY_HDX; /* half-duplex */
misc |= NFE_MISC1_HDX;
}
Index: src/sys/dev/pci/if_sk.c
diff -u src/sys/dev/pci/if_sk.c:1.85 src/sys/dev/pci/if_sk.c:1.85.8.1
--- src/sys/dev/pci/if_sk.c:1.85 Thu Dec 15 09:28:05 2016
+++ src/sys/dev/pci/if_sk.c Mon May 13 12:40:13 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: if_sk.c,v 1.85 2016/12/15 09:28:05 ozaki-r Exp $ */
+/* $NetBSD: if_sk.c,v 1.85.8.1 2019/05/13 12:40:13 martin Exp $ */
/*-
* Copyright (c) 2003 The NetBSD Foundation, Inc.
@@ -115,7 +115,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_sk.c,v 1.85 2016/12/15 09:28:05 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_sk.c,v 1.85.8.1 2019/05/13 12:40:13 martin Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -472,7 +472,7 @@ sk_xmac_miibus_statchg(struct ifnet *ifp
* duplex mode accordingly.
*/
if (sc_if->sk_phytype != SK_PHYTYPE_XMAC) {
- if ((mii->mii_media_active & IFM_GMASK) == IFM_FDX)
+ if ((mii->mii_media_active & IFM_FDX) != 0)
SK_XM_SETBIT_2(sc_if, XM_MMUCMD, XM_MMUCMD_GMIIFDX);
else
SK_XM_CLRBIT_2(sc_if, XM_MMUCMD, XM_MMUCMD_GMIIFDX);
Index: src/sys/dev/pci/if_ti.c
diff -u src/sys/dev/pci/if_ti.c:1.101.8.1 src/sys/dev/pci/if_ti.c:1.101.8.2
--- src/sys/dev/pci/if_ti.c:1.101.8.1 Tue Oct 24 08:38:59 2017
+++ src/sys/dev/pci/if_ti.c Mon May 13 12:40:13 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: if_ti.c,v 1.101.8.1 2017/10/24 08:38:59 snj Exp $ */
+/* $NetBSD: if_ti.c,v 1.101.8.2 2019/05/13 12:40:13 martin Exp $ */
/*
* Copyright (c) 1997, 1998, 1999
@@ -81,7 +81,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_ti.c,v 1.101.8.1 2017/10/24 08:38:59 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ti.c,v 1.101.8.2 2019/05/13 12:40:13 martin Exp $");
#include "opt_inet.h"
@@ -2581,7 +2581,7 @@ ti_ifmedia_upd(struct ifnet *ifp)
break;
case IFM_1000_SX:
case IFM_1000_T:
- if ((ifm->ifm_media & IFM_GMASK) == IFM_FDX) {
+ if ((ifm->ifm_media & IFM_FDX) != 0) {
CSR_WRITE_4(sc, TI_GCR_GLINK,
TI_GLNK_PREF|TI_GLNK_1000MB|TI_GLNK_FULL_DUPLEX|
TI_GLNK_RX_FLOWCTL_Y|TI_GLNK_ENB);
@@ -2606,7 +2606,7 @@ ti_ifmedia_upd(struct ifnet *ifp)
} else {
TI_SETBIT(sc, TI_GCR_LINK, TI_LNK_10MB);
}
- if ((ifm->ifm_media & IFM_GMASK) == IFM_FDX) {
+ if ((ifm->ifm_media & IFM_FDX) != 0) {
TI_SETBIT(sc, TI_GCR_LINK, TI_LNK_FULL_DUPLEX);
} else {
TI_SETBIT(sc, TI_GCR_LINK, TI_LNK_HALF_DUPLEX);
Index: src/sys/dev/pci/if_txp.c
diff -u src/sys/dev/pci/if_txp.c:1.47.8.1 src/sys/dev/pci/if_txp.c:1.47.8.2
--- src/sys/dev/pci/if_txp.c:1.47.8.1 Tue Oct 24 08:38:59 2017
+++ src/sys/dev/pci/if_txp.c Mon May 13 12:40:13 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: if_txp.c,v 1.47.8.1 2017/10/24 08:38:59 snj Exp $ */
+/* $NetBSD: if_txp.c,v 1.47.8.2 2019/05/13 12:40:13 martin Exp $ */
/*
* Copyright (c) 2001
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_txp.c,v 1.47.8.1 2017/10/24 08:38:59 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_txp.c,v 1.47.8.2 2019/05/13 12:40:13 martin Exp $");
#include "opt_inet.h"
@@ -1781,13 +1781,13 @@ txp_ifmedia_upd(struct ifnet *ifp)
return (EINVAL);
if (IFM_SUBTYPE(ifm->ifm_media) == IFM_10_T) {
- if ((ifm->ifm_media & IFM_GMASK) == IFM_FDX)
+ if ((ifm->ifm_media & IFM_FDX) != 0)
new_xcvr = TXP_XCVR_10_FDX;
else
new_xcvr = TXP_XCVR_10_HDX;
} else if ((IFM_SUBTYPE(ifm->ifm_media) == IFM_100_TX) ||
(IFM_SUBTYPE(ifm->ifm_media) == IFM_100_FX)) {
- if ((ifm->ifm_media & IFM_GMASK) == IFM_FDX)
+ if ((ifm->ifm_media & IFM_FDX) != 0)
new_xcvr = TXP_XCVR_100_FDX;
else
new_xcvr = TXP_XCVR_100_HDX;
Index: src/sys/dev/pci/if_vge.c
diff -u src/sys/dev/pci/if_vge.c:1.60.8.1 src/sys/dev/pci/if_vge.c:1.60.8.2
--- src/sys/dev/pci/if_vge.c:1.60.8.1 Tue Oct 24 08:38:59 2017
+++ src/sys/dev/pci/if_vge.c Mon May 13 12:40:13 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: if_vge.c,v 1.60.8.1 2017/10/24 08:38:59 snj Exp $ */
+/* $NetBSD: if_vge.c,v 1.60.8.2 2019/05/13 12:40:13 martin Exp $ */
/*-
* Copyright (c) 2004
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_vge.c,v 1.60.8.1 2017/10/24 08:38:59 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_vge.c,v 1.60.8.2 2019/05/13 12:40:13 martin Exp $");
/*
* VIA Networking Technologies VT612x PCI gigabit ethernet NIC driver.
@@ -1982,7 +1982,7 @@ vge_miibus_statchg(struct ifnet *ifp)
case IFM_100_TX:
case IFM_10_T:
CSR_SETBIT_1(sc, VGE_DIAGCTL, VGE_DIAGCTL_MACFORCE);
- if ((ife->ifm_media & IFM_GMASK) == IFM_FDX) {
+ if ((ife->ifm_media & IFM_FDX) != 0) {
CSR_SETBIT_1(sc, VGE_DIAGCTL, VGE_DIAGCTL_FDXFORCE);
} else {
CSR_CLRBIT_1(sc, VGE_DIAGCTL, VGE_DIAGCTL_FDXFORCE);
Index: src/sys/dev/usb/if_aue.c
diff -u src/sys/dev/usb/if_aue.c:1.141.8.3 src/sys/dev/usb/if_aue.c:1.141.8.4
--- src/sys/dev/usb/if_aue.c:1.141.8.3 Fri Mar 29 19:48:36 2019
+++ src/sys/dev/usb/if_aue.c Mon May 13 12:40:13 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: if_aue.c,v 1.141.8.3 2019/03/29 19:48:36 martin Exp $ */
+/* $NetBSD: if_aue.c,v 1.141.8.4 2019/05/13 12:40:13 martin Exp $ */
/*
* Copyright (c) 1997, 1998, 1999, 2000
@@ -78,7 +78,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_aue.c,v 1.141.8.3 2019/03/29 19:48:36 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_aue.c,v 1.141.8.4 2019/05/13 12:40:13 martin Exp $");
#ifdef _KERNEL_OPT
#include "opt_usb.h"
@@ -534,7 +534,7 @@ aue_miibus_statchg(struct ifnet *ifp)
AUE_CLRBIT(sc, AUE_CTL1, AUE_CTL1_SPEEDSEL);
}
- if ((mii->mii_media_active & IFM_GMASK) == IFM_FDX)
+ if ((mii->mii_media_active & IFM_FDX) != 0)
AUE_SETBIT(sc, AUE_CTL1, AUE_CTL1_DUPLEX);
else
AUE_CLRBIT(sc, AUE_CTL1, AUE_CTL1_DUPLEX);
Index: src/sys/dev/usb/if_axen.c
diff -u src/sys/dev/usb/if_axen.c:1.11.8.7 src/sys/dev/usb/if_axen.c:1.11.8.8
--- src/sys/dev/usb/if_axen.c:1.11.8.7 Wed Feb 20 09:49:48 2019
+++ src/sys/dev/usb/if_axen.c Mon May 13 12:40:13 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: if_axen.c,v 1.11.8.7 2019/02/20 09:49:48 martin Exp $ */
+/* $NetBSD: if_axen.c,v 1.11.8.8 2019/05/13 12:40:13 martin 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.11.8.7 2019/02/20 09:49:48 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_axen.c,v 1.11.8.8 2019/05/13 12:40:13 martin Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -268,7 +268,7 @@ axen_miibus_statchg(struct ifnet *ifp)
return;
val = 0;
- if ((mii->mii_media_active & IFM_GMASK) == IFM_FDX)
+ if ((mii->mii_media_active & IFM_FDX) != 0)
val |= AXEN_MEDIUM_FDX;
val |= AXEN_MEDIUM_RXFLOW_CTRL_EN | AXEN_MEDIUM_TXFLOW_CTRL_EN |
