diff --git a/sys/arch/acorn32/podulebus/if_ie.c b/sys/arch/acorn32/podulebus/if_ie.c
index 5f560fde650e..e688fe33a054 100644
--- a/sys/arch/acorn32/podulebus/if_ie.c
+++ b/sys/arch/acorn32/podulebus/if_ie.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_ie.c,v 1.43 2019/02/05 06:17:00 msaitoh Exp $ */
+/* $NetBSD: if_ie.c,v 1.44 2019/09/13 07:55:05 msaitoh Exp $ */
 
 /*
  * Copyright (c) 1995 Melvin Tang-Richardson.
@@ -53,7 +53,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_ie.c,v 1.43 2019/02/05 06:17:00 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ie.c,v 1.44 2019/09/13 07:55:05 msaitoh Exp $");
 
 #define IGNORE_ETHER1_IDROM_CHECKSUM
 
@@ -130,7 +130,7 @@ struct ie_softc {
 	int		sc_ram;
 	int		sc_control;
 	struct ethercom	sc_ethercom;
-	int		promisc;
+	u_short		promisc;
 	int		sc_irqmode;
 
 	u_long	rframes[NFRAMES];
diff --git a/sys/arch/arm/imx/if_enet.c b/sys/arch/arm/imx/if_enet.c
index 2f69fc41c195..917a6da37d12 100644
--- a/sys/arch/arm/imx/if_enet.c
+++ b/sys/arch/arm/imx/if_enet.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_enet.c,v 1.25 2019/07/30 06:26:31 hkenken Exp $	*/
+/*	$NetBSD: if_enet.c,v 1.26 2019/09/13 07:55:05 msaitoh Exp $	*/
 
 /*
  * Copyright (c) 2014 Ryo Shimizu <ryo@nerv.org>
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_enet.c,v 1.25 2019/07/30 06:26:31 hkenken Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_enet.c,v 1.26 2019/09/13 07:55:05 msaitoh Exp $");
 
 #include "vlan.h"
 
@@ -945,7 +945,7 @@ enet_ifflags_cb(struct ethercom *ec)
 {
 	struct ifnet *ifp = &ec->ec_if;
 	struct enet_softc *sc = ifp->if_softc;
-	int change = ifp->if_flags ^ sc->sc_if_flags;
+	u_short change = ifp->if_flags ^ sc->sc_if_flags;
 
 	if ((change & ~(IFF_CANTCHANGE | IFF_DEBUG)) != 0)
 		return ENETRESET;
diff --git a/sys/arch/arm/imx/if_enetvar.h b/sys/arch/arm/imx/if_enetvar.h
index 7dc211ce9134..a8e9a7350b09 100644
--- a/sys/arch/arm/imx/if_enetvar.h
+++ b/sys/arch/arm/imx/if_enetvar.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_enetvar.h,v 1.4 2019/07/23 06:36:36 hkenken Exp $	*/
+/*	$NetBSD: if_enetvar.h,v 1.5 2019/09/13 07:55:06 msaitoh Exp $	*/
 
 /*
  * Copyright (c) 2014 Ryo Shimizu <ryo@nerv.org>
@@ -85,7 +85,7 @@ struct enet_softc {
 	int sc_rx_readidx;
 
 	/* misc */
-	int sc_if_flags;			/* local copy of if_flags */
+	u_short sc_if_flags;			/* local copy of if_flags */
 	int sc_flowflags;			/* 802.3x flow control flags */
 	struct ethercom sc_ethercom;		/* interface info */
 	struct mii_data sc_mii;
diff --git a/sys/arch/arm/xscale/ixp425_if_npe.c b/sys/arch/arm/xscale/ixp425_if_npe.c
index 034ebae377b2..ed05a970f8cd 100644
--- a/sys/arch/arm/xscale/ixp425_if_npe.c
+++ b/sys/arch/arm/xscale/ixp425_if_npe.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: ixp425_if_npe.c,v 1.41 2019/05/28 07:41:46 msaitoh Exp $ */
+/*	$NetBSD: ixp425_if_npe.c,v 1.42 2019/09/13 07:55:06 msaitoh Exp $ */
 
 /*-
  * Copyright (c) 2006 Sam Leffler.  All rights reserved.
@@ -28,7 +28,7 @@
 #if 0
 __FBSDID("$FreeBSD: src/sys/arm/xscale/ixp425/if_npe.c,v 1.1 2006/11/19 23:55:23 sam Exp $");
 #endif
-__KERNEL_RCSID(0, "$NetBSD: ixp425_if_npe.c,v 1.41 2019/05/28 07:41:46 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ixp425_if_npe.c,v 1.42 2019/09/13 07:55:06 msaitoh Exp $");
 
 /*
  * Intel XScale NPE Ethernet driver.
@@ -118,7 +118,7 @@ struct npe_softc {
 	struct npestats	*sc_stats;
 	bus_dmamap_t	sc_stats_map;
 	bus_addr_t	sc_stats_phys;	/* phys addr of sc_stats */
-	int		sc_if_flags;	/* keep last if_flags */
+	u_short		sc_if_flags;	/* keep last if_flags */
 	krndsource_t rnd_source; /* random source */
 };
 
@@ -1458,7 +1458,7 @@ npeioctl(struct ifnet *ifp, u_long cmd, void *data)
 			 */
 			error = (*ifp->if_init)(ifp);
 		} else if ((ifp->if_flags & IFF_UP) != 0) {
-			int diff;
+			u_short diff;
 
 			/* Up (AND RUNNING). */
 
diff --git a/sys/arch/mac68k/nubus/if_netdock_nubus.c b/sys/arch/mac68k/nubus/if_netdock_nubus.c
index 50701c1a2632..b93d8074d8bc 100644
--- a/sys/arch/mac68k/nubus/if_netdock_nubus.c
+++ b/sys/arch/mac68k/nubus/if_netdock_nubus.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_netdock_nubus.c,v 1.29 2019/02/05 06:17:01 msaitoh Exp $	*/
+/*	$NetBSD: if_netdock_nubus.c,v 1.30 2019/09/13 07:55:06 msaitoh Exp $	*/
 
 /*
  * Copyright (C) 2000,2002 Daishi Kato <daishi@axlight.com>
@@ -43,7 +43,7 @@
 /***********************/
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_netdock_nubus.c,v 1.29 2019/02/05 06:17:01 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_netdock_nubus.c,v 1.30 2019/09/13 07:55:06 msaitoh Exp $");
 
 #include <sys/param.h>
 #include <sys/device.h>
@@ -377,7 +377,7 @@ netdock_ioctl(struct ifnet *ifp, u_long cmd, void *data)
 	struct netdock_softc *sc = ifp->if_softc;
 	int s = splnet();
 	int err = 0;
-	int temp;
+	u_short temp;
 
 	switch (cmd) {
 	case SIOCINITIFADDR:
@@ -546,7 +546,7 @@ static void
 netdock_watchdog(struct ifnet *ifp)
 {
 	struct netdock_softc *sc = ifp->if_softc;
-	int tmp;
+	u_short tmp;
 
 	printf("netdock_watchdog: resetting chip\n");
 	tmp = ifp->if_flags & IFF_UP;
diff --git a/sys/arch/mips/atheros/dev/aevar.h b/sys/arch/mips/atheros/dev/aevar.h
index 609ba33ef751..e64adcd4cb4c 100644
--- a/sys/arch/mips/atheros/dev/aevar.h
+++ b/sys/arch/mips/atheros/dev/aevar.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: aevar.h,v 1.7 2015/04/13 21:18:42 riastradh Exp $	*/
+/*	$NetBSD: aevar.h,v 1.8 2019/09/13 07:55:06 msaitoh Exp $	*/
 
 /*-
  * Copyright (c) 1998, 1999, 2000 The NetBSD Foundation, Inc.
@@ -178,7 +178,7 @@ struct ae_softc {
 	struct ae_txsq sc_txfreeq;	/* free Tx descsofts */
 	struct ae_txsq sc_txdirtyq;	/* dirty Tx descsofts */
 
-	short	sc_if_flags;
+	u_short	sc_if_flags;
 
 	int	sc_rxptr;		/* next ready RX descriptor/descsoft */
 
diff --git a/sys/arch/mips/atheros/dev/if_ae.c b/sys/arch/mips/atheros/dev/if_ae.c
index f932eb4f9550..89cfd78e6eaa 100644
--- a/sys/arch/mips/atheros/dev/if_ae.c
+++ b/sys/arch/mips/atheros/dev/if_ae.c
@@ -1,4 +1,4 @@
-/* $Id: if_ae.c,v 1.36 2019/05/28 07:41:47 msaitoh Exp $ */
+/* $Id: if_ae.c,v 1.37 2019/09/13 07:55:06 msaitoh Exp $ */
 /*-
  * Copyright (c) 2006 Urbana-Champaign Independent Media Center.
  * Copyright (c) 2006 Garrett D'Amore.
@@ -98,7 +98,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_ae.c,v 1.36 2019/05/28 07:41:47 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ae.c,v 1.37 2019/09/13 07:55:06 msaitoh Exp $");
 
 
 #include <sys/param.h>
@@ -804,7 +804,7 @@ ae_ifflags_cb(struct ethercom *ec)
 {
 	struct ifnet *ifp = &ec->ec_if;
 	struct ae_softc *sc = ifp->if_softc;
-	int change = ifp->if_flags ^ sc->sc_if_flags;
+	u_short change = ifp->if_flags ^ sc->sc_if_flags;
 
 	if ((change & ~(IFF_CANTCHANGE | IFF_DEBUG)) != 0)
 		return ENETRESET;
diff --git a/sys/arch/mips/sibyte/dev/sbmac.c b/sys/arch/mips/sibyte/dev/sbmac.c
index 2a5e0c640421..1be967ba9eb5 100644
--- a/sys/arch/mips/sibyte/dev/sbmac.c
+++ b/sys/arch/mips/sibyte/dev/sbmac.c
@@ -1,4 +1,4 @@
-/* $NetBSD: sbmac.c,v 1.60 2019/05/28 07:41:47 msaitoh Exp $ */
+/* $NetBSD: sbmac.c,v 1.61 2019/09/13 07:55:06 msaitoh Exp $ */
 
 /*
  * Copyright 2000, 2001, 2004
@@ -33,7 +33,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sbmac.c,v 1.60 2019/05/28 07:41:47 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sbmac.c,v 1.61 2019/09/13 07:55:06 msaitoh Exp $");
 
 #include "opt_inet.h"
 #include "opt_ns.h"
@@ -172,7 +172,7 @@ struct sbmac_softc {
 	struct callout	sc_tick_ch;
 
 	device_t	sc_dev;		/* device */
-	int		sbm_if_flags;
+	u_short		sbm_if_flags;
 	void		*sbm_intrhand;
 
 	/*
diff --git a/sys/arch/newsmips/apbus/if_sn.c b/sys/arch/newsmips/apbus/if_sn.c
index 54a6238c0c6b..cf97c797a147 100644
--- a/sys/arch/newsmips/apbus/if_sn.c
+++ b/sys/arch/newsmips/apbus/if_sn.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_sn.c,v 1.45 2019/05/28 07:41:47 msaitoh Exp $	*/
+/*	$NetBSD: if_sn.c,v 1.46 2019/09/13 07:55:06 msaitoh Exp $	*/
 
 /*
  * National Semiconductor  DP8393X SONIC Driver
@@ -16,7 +16,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_sn.c,v 1.45 2019/05/28 07:41:47 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_sn.c,v 1.46 2019/09/13 07:55:06 msaitoh Exp $");
 
 #include "opt_inet.h"
 
@@ -225,7 +225,7 @@ snioctl(struct ifnet *ifp, u_long cmd, void *data)
 	struct ifaddr *ifa;
 	struct sn_softc *sc = ifp->if_softc;
 	int	s = splnet(), err = 0;
-	int	temp;
+	u_short	temp;
 
 	switch (cmd) {
 
@@ -480,7 +480,7 @@ snwatchdog(struct ifnet *ifp)
 {
 	struct sn_softc *sc = ifp->if_softc;
 	struct mtd *mtd;
-	int	temp;
+	u_short	temp;
 
 	if (sc->mtd_hw != sc->mtd_free) {
 		/* something still pending for transmit */
diff --git a/sys/arch/sun3/dev/if_ievar.h b/sys/arch/sun3/dev/if_ievar.h
index 4eaeddbb30c9..93d87fa4cf15 100644
--- a/sys/arch/sun3/dev/if_ievar.h
+++ b/sys/arch/sun3/dev/if_ievar.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_ievar.h,v 1.15 2008/06/28 12:13:38 tsutsui Exp $	*/
+/*	$NetBSD: if_ievar.h,v 1.16 2019/09/13 07:55:06 msaitoh Exp $	*/
 
 /*
  * Machine-dependent glue for the Intel Ethernet (ie) driver.
@@ -80,7 +80,7 @@ struct ie_softc {
 	enum ie_hardware hard_type;	/* card type */
 
 	int     want_mcsetup;	/* flag for multicast setup */
-	int     promisc;	/* are we in promisc mode? */
+	u_short     promisc;	/* are we in promisc mode? */
 
 	int ntxbuf;       /* number of tx frames/buffers */
 	int nframes;      /* number of recv frames in use */
diff --git a/sys/dev/ic/athnvar.h b/sys/dev/ic/athnvar.h
index b7d8de874d51..8ec5f0182310 100644
--- a/sys/dev/ic/athnvar.h
+++ b/sys/dev/ic/athnvar.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: athnvar.h,v 1.6 2017/02/02 10:05:35 nonaka Exp $	*/
+/*	$NetBSD: athnvar.h,v 1.7 2019/09/13 07:55:06 msaitoh Exp $	*/
 /*	$OpenBSD: athnvar.h,v 1.34 2013/10/21 16:13:49 stsp Exp $	*/
 
 /*-
@@ -564,7 +564,7 @@ struct athn_softc {
 	void				*sc_txsring;
 	int				sc_txscur;
 
-	int				sc_if_flags;
+	u_short				sc_if_flags;
 	int				sc_tx_timer;
 
 	const struct athn_ini		*sc_ini;
diff --git a/sys/dev/ic/dwc_gmac.c b/sys/dev/ic/dwc_gmac.c
index 2d3a4b6453be..7fe88d10ce4a 100644
--- a/sys/dev/ic/dwc_gmac.c
+++ b/sys/dev/ic/dwc_gmac.c
@@ -1,4 +1,4 @@
-/* $NetBSD: dwc_gmac.c,v 1.64 2019/07/21 08:24:32 mrg Exp $ */
+/* $NetBSD: dwc_gmac.c,v 1.65 2019/09/13 07:55:06 msaitoh Exp $ */
 
 /*-
  * Copyright (c) 2013, 2014 The NetBSD Foundation, Inc.
@@ -41,7 +41,7 @@
 
 #include <sys/cdefs.h>
 
-__KERNEL_RCSID(1, "$NetBSD: dwc_gmac.c,v 1.64 2019/07/21 08:24:32 mrg Exp $");
+__KERNEL_RCSID(1, "$NetBSD: dwc_gmac.c,v 1.65 2019/09/13 07:55:06 msaitoh Exp $");
 
 /* #define	DWC_GMAC_DEBUG	1 */
 
@@ -1094,7 +1094,7 @@ dwc_gmac_ifflags_cb(struct ethercom *ec)
 	int ret = 0;
 
 	mutex_enter(sc->sc_lock);
-	int change = ifp->if_flags ^ sc->sc_if_flags;
+	u_short change = ifp->if_flags ^ sc->sc_if_flags;
 	sc->sc_if_flags = ifp->if_flags;
 
 	if ((change & ~(IFF_CANTCHANGE | IFF_DEBUG)) != 0) {
diff --git a/sys/dev/ic/dwc_gmac_var.h b/sys/dev/ic/dwc_gmac_var.h
index a56160850b6e..ee538cae5655 100644
--- a/sys/dev/ic/dwc_gmac_var.h
+++ b/sys/dev/ic/dwc_gmac_var.h
@@ -1,4 +1,4 @@
-/* $NetBSD: dwc_gmac_var.h,v 1.15 2019/07/21 08:24:32 mrg Exp $ */
+/* $NetBSD: dwc_gmac_var.h,v 1.16 2019/09/13 07:55:06 msaitoh Exp $ */
 
 /*-
  * Copyright (c) 2013, 2014 The NetBSD Foundation, Inc.
@@ -120,7 +120,7 @@ struct dwc_gmac_softc {
 	struct dwc_gmac_rx_ring sc_rxq;
 	struct dwc_gmac_tx_ring sc_txq;
 	const struct dwc_gmac_desc_methods *sc_descm;
-	short sc_if_flags;			/* shadow of ether flags */
+	u_short sc_if_flags;			/* shadow of ether flags */
 	uint16_t sc_mii_clk;
 	bool sc_stopping;
 	krndsource_t rnd_source;
diff --git a/sys/dev/ic/elinkxl.c b/sys/dev/ic/elinkxl.c
index babc46858525..2137e131b489 100644
--- a/sys/dev/ic/elinkxl.c
+++ b/sys/dev/ic/elinkxl.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: elinkxl.c,v 1.131 2019/05/28 07:41:48 msaitoh Exp $	*/
+/*	$NetBSD: elinkxl.c,v 1.132 2019/09/13 07:55:06 msaitoh Exp $	*/
 
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: elinkxl.c,v 1.131 2019/05/28 07:41:48 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: elinkxl.c,v 1.132 2019/09/13 07:55:06 msaitoh Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -1436,7 +1436,7 @@ ex_ifflags_cb(struct ethercom *ec)
 {
 	struct ifnet *ifp = &ec->ec_if;
 	struct ex_softc *sc = ifp->if_softc;
-	int change = ifp->if_flags ^ sc->sc_if_flags;
+	u_short change = ifp->if_flags ^ sc->sc_if_flags;
 
 	if ((change & ~(IFF_CANTCHANGE | IFF_DEBUG)) != 0)
 		return ENETRESET;
diff --git a/sys/dev/ic/elinkxlvar.h b/sys/dev/ic/elinkxlvar.h
index 20bf28603cfe..4289b341f94b 100644
--- a/sys/dev/ic/elinkxlvar.h
+++ b/sys/dev/ic/elinkxlvar.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: elinkxlvar.h,v 1.25 2015/04/13 16:33:24 riastradh Exp $	*/
+/*	$NetBSD: elinkxlvar.h,v 1.26 2019/09/13 07:55:06 msaitoh Exp $	*/
 
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -118,7 +118,7 @@ struct ex_softc {
 	bus_dma_segment_t sc_useg, sc_dseg;
 	int sc_urseg, sc_drseg;
 
-	short sc_if_flags;
+	u_short sc_if_flags;
 };
 
 #define ex_waitcmd(sc) \
diff --git a/sys/dev/ic/gem.c b/sys/dev/ic/gem.c
index 7b598c5512f3..d4ae78b075c7 100644
--- a/sys/dev/ic/gem.c
+++ b/sys/dev/ic/gem.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: gem.c,v 1.120 2019/05/28 08:59:34 msaitoh Exp $ */
+/*	$NetBSD: gem.c,v 1.121 2019/09/13 07:55:06 msaitoh Exp $ */
 
 /*
  *
@@ -37,7 +37,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: gem.c,v 1.120 2019/05/28 08:59:34 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: gem.c,v 1.121 2019/09/13 07:55:06 msaitoh Exp $");
 
 #include "opt_inet.h"
 
@@ -2605,7 +2605,7 @@ gem_ifflags_cb(struct ethercom *ec)
 {
 	struct ifnet *ifp = &ec->ec_if;
 	struct gem_softc *sc = ifp->if_softc;
-	int change = ifp->if_flags ^ sc->sc_if_flags;
+	u_short change = ifp->if_flags ^ sc->sc_if_flags;
 
 	if ((change & ~(IFF_CANTCHANGE | IFF_DEBUG)) != 0)
 		return ENETRESET;
diff --git a/sys/dev/ic/gemvar.h b/sys/dev/ic/gemvar.h
index bc73069c192c..fc09be75b460 100644
--- a/sys/dev/ic/gemvar.h
+++ b/sys/dev/ic/gemvar.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: gemvar.h,v 1.25 2015/04/13 16:33:24 riastradh Exp $ */
+/*	$NetBSD: gemvar.h,v 1.26 2019/09/13 07:55:06 msaitoh Exp $ */
 
 /*
  *
@@ -163,7 +163,7 @@ struct gem_softc {
 	int		sc_chiprev;	/* hardware revision */
 
 	u_int		sc_flags;	/* */
-	short		sc_if_flags;	/* copy of ifp->if_flags */
+	u_short		sc_if_flags;	/* copy of ifp->if_flags */
 #define	GEM_GIGABIT		0x0001	/* has a gigabit PHY */
 #define GEM_LINK		0x0002	/* link is up */
 #define	GEM_PCI			0x0004	/* XXX PCI busses are little-endian */
diff --git a/sys/dev/ic/tulip.c b/sys/dev/ic/tulip.c
index 83978b28f2dc..6e3ea2e58150 100644
--- a/sys/dev/ic/tulip.c
+++ b/sys/dev/ic/tulip.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: tulip.c,v 1.198 2019/07/30 16:49:20 msaitoh Exp $	*/
+/*	$NetBSD: tulip.c,v 1.199 2019/09/13 07:55:06 msaitoh Exp $	*/
 
 /*-
  * Copyright (c) 1998, 1999, 2000, 2002 The NetBSD Foundation, Inc.
@@ -36,7 +36,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tulip.c,v 1.198 2019/07/30 16:49:20 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tulip.c,v 1.199 2019/09/13 07:55:06 msaitoh Exp $");
 
 
 #include <sys/param.h>
@@ -965,7 +965,7 @@ tlp_ifflags_cb(struct ethercom *ec)
 {
 	struct ifnet *ifp = &ec->ec_if;
 	struct tulip_softc *sc = ifp->if_softc;
-	int change = ifp->if_flags ^ sc->sc_if_flags;
+	u_short change = ifp->if_flags ^ sc->sc_if_flags;
 
 	if ((change & ~(IFF_CANTCHANGE | IFF_DEBUG)) != 0)
 		return ENETRESET;
diff --git a/sys/dev/ic/tulipvar.h b/sys/dev/ic/tulipvar.h
index eeb4c013ee0b..20ba48431e8c 100644
--- a/sys/dev/ic/tulipvar.h
+++ b/sys/dev/ic/tulipvar.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: tulipvar.h,v 1.69 2015/04/13 16:33:24 riastradh Exp $	*/
+/*	$NetBSD: tulipvar.h,v 1.70 2019/09/13 07:55:06 msaitoh Exp $	*/
 
 /*-
  * Copyright (c) 1998, 1999, 2000 The NetBSD Foundation, Inc.
@@ -439,7 +439,7 @@ struct tulip_softc {
 	struct tulip_txsq sc_txfreeq;	/* free Tx descsofts */
 	struct tulip_txsq sc_txdirtyq;	/* dirty Tx descsofts */
 
-	short	sc_if_flags;
+	u_short	sc_if_flags;
 
 	int	sc_rxptr;		/* next ready RX descriptor/descsoft */
 
diff --git a/sys/dev/isa/if_iy.c b/sys/dev/isa/if_iy.c
index 8def5f1c6e2b..1c99b4e6e0e6 100644
--- a/sys/dev/isa/if_iy.c
+++ b/sys/dev/isa/if_iy.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_iy.c,v 1.109 2019/05/29 10:07:29 msaitoh Exp $	*/
+/*	$NetBSD: if_iy.c,v 1.110 2019/09/13 07:55:06 msaitoh Exp $	*/
 /* #define IYDEBUG */
 /* #define IYMEMDEBUG */
 
@@ -39,7 +39,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_iy.c,v 1.109 2019/05/29 10:07:29 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_iy.c,v 1.110 2019/09/13 07:55:06 msaitoh Exp $");
 
 #include "opt_inet.h"
 
@@ -107,7 +107,7 @@ struct iy_softc {
 
 	int hard_vers;
 
-	int promisc;
+	u_short promisc;
 
 	int sram, tx_size, rx_size;
 
diff --git a/sys/dev/marvell/if_mvgbe.c b/sys/dev/marvell/if_mvgbe.c
index 7d8821fcf03f..d824deac63ae 100644
--- a/sys/dev/marvell/if_mvgbe.c
+++ b/sys/dev/marvell/if_mvgbe.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_mvgbe.c,v 1.57 2019/05/28 07:41:49 msaitoh Exp $	*/
+/*	$NetBSD: if_mvgbe.c,v 1.58 2019/09/13 07:55:07 msaitoh Exp $	*/
 /*
  * Copyright (c) 2007, 2008, 2013 KIYOHARA Takashi
  * All rights reserved.
@@ -25,7 +25,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_mvgbe.c,v 1.57 2019/05/28 07:41:49 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_mvgbe.c,v 1.58 2019/09/13 07:55:07 msaitoh Exp $");
 
 #include "opt_multiprocessor.h"
 
@@ -234,7 +234,7 @@ struct mvgbe_softc {
 	struct mvgbe_chain_data sc_cdata;
 	struct mvgbe_ring_data *sc_rdata;
 	bus_dmamap_t sc_ring_map;
-	int sc_if_flags;
+	u_short sc_if_flags;
 	unsigned int sc_ipginttx;
 	unsigned int sc_ipgintrx;
 	int sc_wdogsoft;
@@ -1467,7 +1467,7 @@ mvgbe_ifflags_cb(struct ethercom *ec)
 {
 	struct ifnet *ifp = &ec->ec_if;
 	struct mvgbe_softc *sc = ifp->if_softc;
-	int change = ifp->if_flags ^ sc->sc_if_flags;
+	u_short change = ifp->if_flags ^ sc->sc_if_flags;
 
 	if (change != 0)
 		sc->sc_if_flags = ifp->if_flags;
diff --git a/sys/dev/marvell/if_mvxpe.c b/sys/dev/marvell/if_mvxpe.c
index fb8ed85edd2c..8cd70f2268bf 100644
--- a/sys/dev/marvell/if_mvxpe.c
+++ b/sys/dev/marvell/if_mvxpe.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_mvxpe.c,v 1.27 2019/05/28 07:41:49 msaitoh Exp $	*/
+/*	$NetBSD: if_mvxpe.c,v 1.28 2019/09/13 07:55:07 msaitoh Exp $	*/
 /*
  * Copyright (c) 2015 Internet Initiative Japan Inc.
  * All rights reserved.
@@ -25,7 +25,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_mvxpe.c,v 1.27 2019/05/28 07:41:49 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_mvxpe.c,v 1.28 2019/09/13 07:55:07 msaitoh Exp $");
 
 #include "opt_multiprocessor.h"
 
@@ -1959,7 +1959,7 @@ mvxpe_ifflags_cb(struct ethercom *ec)
 {
 	struct ifnet *ifp = &ec->ec_if;
 	struct mvxpe_softc *sc = ifp->if_softc;
-	int change = ifp->if_flags ^ sc->sc_if_flags;
+	u_short change = ifp->if_flags ^ sc->sc_if_flags;
 
 	mvxpe_sc_lock(sc);
 
diff --git a/sys/dev/marvell/if_mvxpevar.h b/sys/dev/marvell/if_mvxpevar.h
index 19a06aeed4b0..9f86a8d98911 100644
--- a/sys/dev/marvell/if_mvxpevar.h
+++ b/sys/dev/marvell/if_mvxpevar.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_mvxpevar.h,v 1.4 2018/04/19 21:50:08 christos Exp $	*/
+/*	$NetBSD: if_mvxpevar.h,v 1.5 2019/09/13 07:55:07 msaitoh Exp $	*/
 /*
  * Copyright (c) 2015 Internet Initiative Japan Inc.
  * All rights reserved.
@@ -404,7 +404,7 @@ struct mvxpe_softc {
 	struct ethercom sc_ethercom;
 	struct mii_data sc_mii;
 	u_int8_t sc_enaddr[ETHER_ADDR_LEN];	/* station addr */
-	int sc_if_flags;
+	u_short sc_if_flags;
 	int sc_wdogsoft;
 
 	/*
diff --git a/sys/dev/pci/cxgb/cxgb_adapter.h b/sys/dev/pci/cxgb/cxgb_adapter.h
index 46eee3a236f7..c6f18581e00d 100644
--- a/sys/dev/pci/cxgb/cxgb_adapter.h
+++ b/sys/dev/pci/cxgb/cxgb_adapter.h
@@ -103,7 +103,7 @@ struct port_info {
     struct ifnet    *ifp;
     struct port_device *pd;
     int     port;
-    int     if_flags;
+    u_short     if_flags;
     const struct port_type_info *port_type;
     struct cphy phy;
     struct cmac mac;
diff --git a/sys/dev/pci/if_bge.c b/sys/dev/pci/if_bge.c
index f3355ba2b232..f58c61cb1027 100644
--- a/sys/dev/pci/if_bge.c
+++ b/sys/dev/pci/if_bge.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_bge.c,v 1.336 2019/07/30 15:50:08 msaitoh Exp $	*/
+/*	$NetBSD: if_bge.c,v 1.337 2019/09/13 07:55:07 msaitoh Exp $	*/
 
 /*
  * Copyright (c) 2001 Wind River Systems
@@ -79,7 +79,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_bge.c,v 1.336 2019/07/30 15:50:08 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_bge.c,v 1.337 2019/09/13 07:55:07 msaitoh Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -5770,7 +5770,7 @@ bge_ifflags_cb(struct ethercom *ec)
 {
 	struct ifnet *ifp = &ec->ec_if;
 	struct bge_softc *sc = ifp->if_softc;
-	int change = ifp->if_flags ^ sc->bge_if_flags;
+	u_short change = ifp->if_flags ^ sc->bge_if_flags;
 
 	if ((change & ~(IFF_CANTCHANGE | IFF_DEBUG)) != 0)
 		return ENETRESET;
diff --git a/sys/dev/pci/if_bgevar.h b/sys/dev/pci/if_bgevar.h
index e9c6215cc7c5..dfd1aaccf1a9 100644
--- a/sys/dev/pci/if_bgevar.h
+++ b/sys/dev/pci/if_bgevar.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_bgevar.h,v 1.24 2018/11/27 19:17:02 bouyer Exp $	*/
+/*	$NetBSD: if_bgevar.h,v 1.25 2019/09/13 07:55:07 msaitoh Exp $	*/
 /*
  * Copyright (c) 2001 Wind River Systems
  * Copyright (c) 1997, 1998, 1999, 2001
@@ -321,7 +321,7 @@ struct bge_softc {
 #define BGE_STS_BIT(sc, x)	((sc)->bge_sts & (x))
 #define BGE_STS_SETBIT(sc, x)	((sc)->bge_sts |= (x))
 #define BGE_STS_CLRBIT(sc, x)	((sc)->bge_sts &= ~(x))
-	int			bge_if_flags;
+	u_short			bge_if_flags;
 	uint32_t		bge_flags;
 	uint32_t		bge_phy_flags;
 	int			bge_flowflags;
diff --git a/sys/dev/pci/if_etreg.h b/sys/dev/pci/if_etreg.h
index 2451e2e187c1..cb834f781eea 100644
--- a/sys/dev/pci/if_etreg.h
+++ b/sys/dev/pci/if_etreg.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_etreg.h,v 1.3 2019/08/01 13:36:37 msaitoh Exp $	*/
+/*	$NetBSD: if_etreg.h,v 1.4 2019/09/13 07:55:07 msaitoh Exp $	*/
 /*	$OpenBSD: if_etreg.h,v 1.3 2008/06/08 06:18:07 jsg Exp $	*/
 
 /*
@@ -487,7 +487,7 @@ struct et_softc {
 	device_t		sc_dev;
 	struct ethercom		sc_ethercom;
 	uint8_t			sc_enaddr[ETHER_ADDR_LEN];
-	int			sc_if_flags;
+	u_short			sc_if_flags;
 	uint32_t		sc_flags;	/* ET_FLAG_ */
 
 	int			sc_mem_rid;
diff --git a/sys/dev/pci/if_mskvar.h b/sys/dev/pci/if_mskvar.h
index 3df8df535396..5c56eb7356d1 100644
--- a/sys/dev/pci/if_mskvar.h
+++ b/sys/dev/pci/if_mskvar.h
@@ -1,5 +1,5 @@
 /*	$OpenBSD: if_mskvar.h,v 1.3 2006/12/28 16:34:42 kettenis Exp $	*/
-/*	$NetBSD: if_mskvar.h,v 1.21 2018/12/27 08:13:50 mrg Exp $	*/
+/*	$NetBSD: if_mskvar.h,v 1.22 2019/09/13 07:55:07 msaitoh Exp $	*/
 
 /*-
  * Copyright (c) 2003 The NetBSD Foundation, Inc.
@@ -239,7 +239,7 @@ struct sk_if_softc {
 	int			sk_ring_nseg;
 	int			sk_status_idx;
 	struct sk_softc		*sk_softc;	/* parent controller */
-	int			sk_if_flags;
+	u_short			sk_if_flags;
 	kmutex_t		sk_jpool_mtx;
 	LIST_HEAD(__sk_jfreehead, sk_jpool_entry)	sk_jfree_listhead;
 	LIST_HEAD(__sk_jinusehead, sk_jpool_entry)	sk_jinuse_listhead;
diff --git a/sys/dev/pci/if_nfe.c b/sys/dev/pci/if_nfe.c
index 461ee026654e..3bf411566dfc 100644
--- a/sys/dev/pci/if_nfe.c
+++ b/sys/dev/pci/if_nfe.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_nfe.c,v 1.71 2019/07/09 08:46:59 msaitoh Exp $	*/
+/*	$NetBSD: if_nfe.c,v 1.72 2019/09/13 07:55:07 msaitoh 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.71 2019/07/09 08:46:59 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_nfe.c,v 1.72 2019/09/13 07:55:07 msaitoh Exp $");
 
 #include "opt_inet.h"
 #include "vlan.h"
@@ -650,7 +650,7 @@ nfe_ifflags_cb(struct ethercom *ec)
 {
 	struct ifnet *ifp = &ec->ec_if;
 	struct nfe_softc *sc = ifp->if_softc;
-	int change = ifp->if_flags ^ sc->sc_if_flags;
+	u_short change = ifp->if_flags ^ sc->sc_if_flags;
 
 	/*
 	 * If only the PROMISC flag changes, then
diff --git a/sys/dev/pci/if_nfevar.h b/sys/dev/pci/if_nfevar.h
index 0bdcb0d73305..040bb3bd1bff 100644
--- a/sys/dev/pci/if_nfevar.h
+++ b/sys/dev/pci/if_nfevar.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_nfevar.h,v 1.10 2010/11/03 14:03:40 jakllsch Exp $	*/
+/*	$NetBSD: if_nfevar.h,v 1.11 2019/09/13 07:55:07 msaitoh Exp $	*/
 /*	$OpenBSD: if_nfevar.h,v 1.13 2007/12/05 08:30:33 jsg Exp $	*/
 
 /*-
@@ -80,7 +80,7 @@ struct nfe_softc {
 	struct mii_data		sc_mii;
 	struct callout		sc_tick_ch;
 
-	int			sc_if_flags;
+	u_short			sc_if_flags;
 	u_int			sc_flags;
 #define NFE_JUMBO_SUP		0x01
 #define NFE_40BIT_ADDR		0x02
diff --git a/sys/dev/pci/if_sip.c b/sys/dev/pci/if_sip.c
index e2b082533c99..7f37da040268 100644
--- a/sys/dev/pci/if_sip.c
+++ b/sys/dev/pci/if_sip.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_sip.c,v 1.174 2019/07/09 08:46:59 msaitoh Exp $	*/
+/*	$NetBSD: if_sip.c,v 1.175 2019/09/13 07:55:07 msaitoh Exp $	*/
 
 /*-
  * Copyright (c) 2001, 2002 The NetBSD Foundation, Inc.
@@ -73,7 +73,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_sip.c,v 1.174 2019/07/09 08:46:59 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_sip.c,v 1.175 2019/09/13 07:55:07 msaitoh Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -290,7 +290,7 @@ struct sip_softc {
 		int		is_vlan;
 	}	sc_prev;
 
-	short	sc_if_flags;
+	u_short	sc_if_flags;
 
 	int	sc_rxptr;		/* next ready Rx descriptor/descsoft */
 	int	sc_rxdiscard;
@@ -1728,7 +1728,7 @@ sip_ifflags_cb(struct ethercom *ec)
 #define COMPARE_IC(sc, ifp) ((sc)->sc_prev.if_capenable == (ifp)->if_capenable)
 	struct ifnet *ifp = &ec->ec_if;
 	struct sip_softc *sc = ifp->if_softc;
-	int change = ifp->if_flags ^ sc->sc_if_flags;
+	u_short change = ifp->if_flags ^ sc->sc_if_flags;
 
 	if ((change & ~(IFF_CANTCHANGE | IFF_DEBUG)) != 0 || !COMPARE_EC(sc) ||
 	    !COMPARE_IC(sc, ifp))
diff --git a/sys/dev/pci/if_skvar.h b/sys/dev/pci/if_skvar.h
index ec71bff7c0ef..53dce0ad8df9 100644
--- a/sys/dev/pci/if_skvar.h
+++ b/sys/dev/pci/if_skvar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: if_skvar.h,v 1.19 2018/07/03 18:07:36 jdolecek Exp $ */
+/* $NetBSD: if_skvar.h,v 1.20 2019/09/13 07:55:07 msaitoh Exp $ */
 
 /*-
  * Copyright (c) 2003 The NetBSD Foundation, Inc.
@@ -226,7 +226,7 @@ struct sk_if_softc {
 	bus_dmamap_t		sk_ring_map;
 	struct sk_softc		*sk_softc;	/* parent controller */
 	int			sk_tx_bmu;	/* TX BMU register */
-	int			sk_if_flags;
+	u_short			sk_if_flags;
 	kmutex_t		sk_jpool_mtx;
 	LIST_HEAD(__sk_jfreehead, sk_jpool_entry)	sk_jfree_listhead;
 	LIST_HEAD(__sk_jinusehead, sk_jpool_entry)	sk_jinuse_listhead;
diff --git a/sys/dev/pci/if_tireg.h b/sys/dev/pci/if_tireg.h
index 5c732b4b9b24..c4c02c7f5ab6 100644
--- a/sys/dev/pci/if_tireg.h
+++ b/sys/dev/pci/if_tireg.h
@@ -1,4 +1,4 @@
-/* $NetBSD: if_tireg.h,v 1.21 2019/03/05 08:25:02 msaitoh Exp $ */
+/* $NetBSD: if_tireg.h,v 1.22 2019/09/13 07:55:07 msaitoh Exp $ */
 
 /*
  * Copyright (c) 1997, 1998, 1999
@@ -1127,7 +1127,7 @@ struct ti_softc {
 	u_int32_t		ti_rx_max_coal_bds;
 	u_int32_t		ti_tx_max_coal_bds;
 	u_int32_t		ti_tx_buf_ratio;
-	int			ti_if_flags;
+	u_short			ti_if_flags;
 	int			ti_txcnt;
 	void *sc_ih;
 	bus_dma_tag_t sc_dmat;
diff --git a/sys/dev/pci/if_vge.c b/sys/dev/pci/if_vge.c
index c956f8711128..350db48dcba6 100644
--- a/sys/dev/pci/if_vge.c
+++ b/sys/dev/pci/if_vge.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_vge.c,v 1.73 2019/07/09 08:46:59 msaitoh Exp $ */
+/* $NetBSD: if_vge.c,v 1.74 2019/09/13 07:55:07 msaitoh Exp $ */
 
 /*-
  * Copyright (c) 2004
@@ -35,7 +35,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_vge.c,v 1.73 2019/07/09 08:46:59 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_vge.c,v 1.74 2019/09/13 07:55:07 msaitoh Exp $");
 
 /*
  * VIA Networking Technologies VT612x PCI gigabit ethernet NIC driver.
@@ -200,7 +200,7 @@ struct vge_softc {
 	void			*sc_intrhand;
 	struct mii_data		sc_mii;
 	uint8_t			sc_type;
-	int			sc_if_flags;
+	u_short			sc_if_flags;
 	int			sc_link;
 	int			sc_camidx;
 	callout_t		sc_timeout;
@@ -1955,7 +1955,7 @@ vge_ifflags_cb(struct ethercom *ec)
 {
 	struct ifnet *ifp = &ec->ec_if;
 	struct vge_softc *sc = ifp->if_softc;
-	int change = ifp->if_flags ^ sc->sc_if_flags;
+	u_short change = ifp->if_flags ^ sc->sc_if_flags;
 
 	if ((change & ~(IFF_CANTCHANGE | IFF_DEBUG)) != 0)
 		return ENETRESET;
diff --git a/sys/dev/pci/if_vr.c b/sys/dev/pci/if_vr.c
index 2a8718a1f49c..40d04961455e 100644
--- a/sys/dev/pci/if_vr.c
+++ b/sys/dev/pci/if_vr.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_vr.c,v 1.130 2019/05/28 07:41:49 msaitoh Exp $	*/
+/*	$NetBSD: if_vr.c,v 1.131 2019/09/13 07:55:07 msaitoh Exp $	*/
 
 /*-
  * Copyright (c) 1998, 1999 The NetBSD Foundation, Inc.
@@ -97,7 +97,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_vr.c,v 1.130 2019/05/28 07:41:49 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_vr.c,v 1.131 2019/09/13 07:55:07 msaitoh Exp $");
 
 
 
@@ -234,7 +234,7 @@ struct vr_softc {
 	bool		vr_link;
 	int		vr_flags;
 #define VR_F_RESTART	0x1		/* restart on next tick */
-	int		vr_if_flags;
+	u_short		vr_if_flags;
 
 	krndsource_t rnd_source;	/* random source */
 };
diff --git a/sys/dev/pci/if_wm.c b/sys/dev/pci/if_wm.c
index 6531bc8f1ba4..0454f918183d 100644
--- a/sys/dev/pci/if_wm.c
+++ b/sys/dev/pci/if_wm.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_wm.c,v 1.647 2019/09/04 07:07:09 msaitoh Exp $	*/
+/*	$NetBSD: if_wm.c,v 1.648 2019/09/13 07:55:07 msaitoh 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.647 2019/09/04 07:07:09 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.648 2019/09/13 07:55:07 msaitoh Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_net_mpsafe.h"
@@ -514,7 +514,7 @@ struct wm_softc {
 #define	WM_MEDIATYPE_SERDES		0x03 /* Internal SERDES */
 	int sc_funcid;			/* unit number of the chip (0 to 3) */
 	int sc_flags;			/* flags; see below */
-	int sc_if_flags;		/* last if_flags */
+	u_short sc_if_flags;		/* last if_flags */
 	int sc_ec_capenable;		/* last ec_capenable */
 	int sc_flowflags;		/* 802.3x flow control flags */
 	uint16_t eee_lp_ability;	/* EEE link partner's ability */
@@ -3295,7 +3295,8 @@ wm_ifflags_cb(struct ethercom *ec)
 {
 	struct ifnet *ifp = &ec->ec_if;
 	struct wm_softc *sc = ifp->if_softc;
-	int iffchange, ecchange;
+	u_short iffchange;
+	int ecchange;
 	bool needreset = false;
 	int rc = 0;
 
diff --git a/sys/dev/pci/ixgbe/ixgbe.c b/sys/dev/pci/ixgbe/ixgbe.c
index 34c4255bdddf..0c2a43083e45 100644
--- a/sys/dev/pci/ixgbe/ixgbe.c
+++ b/sys/dev/pci/ixgbe/ixgbe.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ixgbe.c,v 1.209 2019/09/05 08:06:51 msaitoh Exp $ */
+/* $NetBSD: ixgbe.c,v 1.210 2019/09/13 07:55:07 msaitoh Exp $ */
 
 /******************************************************************************
 
@@ -6204,7 +6204,8 @@ ixgbe_ifflags_cb(struct ethercom *ec)
 {
 	struct ifnet *ifp = &ec->ec_if;
 	struct adapter *adapter = ifp->if_softc;
-	int change, rv = 0;
+	u_short change;
+	int rv = 0;
 
 	IXGBE_CORE_LOCK(adapter);
 
diff --git a/sys/dev/pci/ixgbe/ixgbe.h b/sys/dev/pci/ixgbe/ixgbe.h
index 9f20ab69e263..93f02ea704ee 100644
--- a/sys/dev/pci/ixgbe/ixgbe.h
+++ b/sys/dev/pci/ixgbe/ixgbe.h
@@ -1,4 +1,4 @@
-/* $NetBSD: ixgbe.h,v 1.57 2019/09/12 06:19:47 msaitoh Exp $ */
+/* $NetBSD: ixgbe.h,v 1.58 2019/09/13 07:55:07 msaitoh Exp $ */
 
 /******************************************************************************
   SPDX-License-Identifier: BSD-3-Clause
@@ -473,7 +473,7 @@ struct adapter {
 
 	struct ifmedia		media;
 	callout_t		timer;
-	int			if_flags;	/* saved ifp->if_flags */
+	u_short			if_flags;	/* saved ifp->if_flags */
 	int			ec_capenable;	/* saved ec->ec_capenable */
 
 	kmutex_t		core_mtx;
diff --git a/sys/dev/pci/ixgbe/ixv.c b/sys/dev/pci/ixgbe/ixv.c
index a119bfc21254..ae6a3fa6a560 100644
--- a/sys/dev/pci/ixgbe/ixv.c
+++ b/sys/dev/pci/ixgbe/ixv.c
@@ -1,4 +1,4 @@
-/*$NetBSD: ixv.c,v 1.135 2019/09/13 06:50:18 msaitoh Exp $*/
+/*$NetBSD: ixv.c,v 1.136 2019/09/13 07:55:07 msaitoh Exp $*/
 
 /******************************************************************************
 
@@ -2905,7 +2905,8 @@ ixv_ifflags_cb(struct ethercom *ec)
 {
 	struct ifnet *ifp = &ec->ec_if;
 	struct adapter *adapter = ifp->if_softc;
-	int change, rv = 0;
+	u_short change;
+	int rv = 0;
 
 	IXGBE_CORE_LOCK(adapter);
 
diff --git a/sys/dev/usb/if_otusvar.h b/sys/dev/usb/if_otusvar.h
index 544b1a77c02f..d00dbe67033b 100644
--- a/sys/dev/usb/if_otusvar.h
+++ b/sys/dev/usb/if_otusvar.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_otusvar.h,v 1.8 2016/04/23 10:15:31 skrll Exp $	*/
+/*	$NetBSD: if_otusvar.h,v 1.9 2019/09/13 07:55:07 msaitoh Exp $	*/
 /*	$OpenBSD: if_otusreg.h,v 1.6 2009/04/06 18:17:01 damien Exp $	*/
 
 /*-
@@ -184,7 +184,7 @@ struct otus_softc {
 	uint8_t 			*sc_ibuf;
 	size_t				sc_ibuf_size;
 
-	int				sc_if_flags;
+	unsigned short			sc_if_flags;
 	int				sc_tx_timer;
 	int				sc_fixed_ridx;
 	int				sc_bb_reset;
diff --git a/sys/dev/usb/usbnet.c b/sys/dev/usb/usbnet.c
index 12c05aa4cd0e..c440aef093b7 100644
--- a/sys/dev/usb/usbnet.c
+++ b/sys/dev/usb/usbnet.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: usbnet.c,v 1.28 2019/09/09 07:20:16 mrg Exp $	*/
+/*	$NetBSD: usbnet.c,v 1.29 2019/09/13 07:55:07 msaitoh Exp $	*/
 
 /*
  * Copyright (c) 2019 Matthew R. Green
@@ -33,7 +33,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: usbnet.c,v 1.28 2019/09/09 07:20:16 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: usbnet.c,v 1.29 2019/09/13 07:55:07 msaitoh Exp $");
 
 #include <sys/param.h>
 #include <sys/kernel.h>
@@ -86,7 +86,7 @@ struct usbnet_private {
 
 	int			unp_refcnt;
 	int			unp_timer;
-	int			unp_if_flags;
+	unsigned short		unp_if_flags;
 	unsigned		unp_number;
 
 	krndsource_t		unp_rndsrc;
@@ -1016,7 +1016,7 @@ usbnet_ifflags_cb(struct ethercom *ec)
 
 	mutex_enter(&unp->unp_lock);
 
-	const int changed = ifp->if_flags ^ unp->unp_if_flags;
+	const u_short changed = ifp->if_flags ^ unp->unp_if_flags;
 	if ((changed & ~(IFF_CANTCHANGE | IFF_DEBUG)) == 0) {
 		unp->unp_if_flags = ifp->if_flags;
 		if ((changed & IFF_PROMISC) != 0)
diff --git a/sys/net/if.c b/sys/net/if.c
index c937520b7c02..7143c4533c3b 100644
--- a/sys/net/if.c
+++ b/sys/net/if.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: if.c,v 1.459 2019/08/20 10:59:00 roy Exp $	*/
+/*	$NetBSD: if.c,v 1.460 2019/09/13 07:55:07 msaitoh Exp $	*/
 
 /*-
  * Copyright (c) 1999, 2000, 2001, 2008 The NetBSD Foundation, Inc.
@@ -90,7 +90,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if.c,v 1.459 2019/08/20 10:59:00 roy Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if.c,v 1.460 2019/09/13 07:55:07 msaitoh Exp $");
 
 #if defined(_KERNEL_OPT)
 #include "opt_inet.h"
@@ -2640,7 +2640,7 @@ int
 ifpromisc_locked(struct ifnet *ifp, int pswitch)
 {
 	int pcount, ret = 0;
-	short nflags;
+	u_short nflags;
 
 	KASSERT(IFNET_LOCKED(ifp));
 
@@ -3206,7 +3206,7 @@ doifioctl(struct socket *so, u_long cmd, void *data, struct lwp *l)
 	struct ifreq *ifr;
 	int error = 0;
 	u_long ocmd = cmd;
-	short oif_flags;
+	u_short oif_flags;
 	struct ifreq ifrb;
 	struct oifreq *oifr = NULL;
 	int r;
@@ -3662,7 +3662,7 @@ if_do_dad(struct ifnet *ifp)
 }
 
 int
-if_flags_set(ifnet_t *ifp, const short flags)
+if_flags_set(ifnet_t *ifp, const u_short flags)
 {
 	int rc;
 
@@ -3671,7 +3671,7 @@ if_flags_set(ifnet_t *ifp, const short flags)
 	if (ifp->if_setflags != NULL)
 		rc = (*ifp->if_setflags)(ifp, flags);
 	else {
-		short cantflags, chgdflags;
+		u_short cantflags, chgdflags;
 		struct ifreq ifr;
 
 		chgdflags = ifp->if_flags ^ flags;
diff --git a/sys/net/if.h b/sys/net/if.h
index d4d9026a1695..d5f1f346e0d9 100644
--- a/sys/net/if.h
+++ b/sys/net/if.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: if.h,v 1.275 2019/08/10 21:13:54 rmind Exp $	*/
+/*	$NetBSD: if.h,v 1.276 2019/09/13 07:55:07 msaitoh Exp $	*/
 
 /*-
  * Copyright (c) 1999, 2000, 2001 The NetBSD Foundation, Inc.
@@ -369,7 +369,7 @@ typedef struct ifnet {
 			    (struct ifnet *, const unsigned long,
 			    const struct sockaddr *);
 	int		(*if_setflags)	/* :: */
-			    (struct ifnet *, const short);
+			    (struct ifnet *, const u_short);
 	kmutex_t	*if_ioctl_lock;	/* :: */
 	char		*if_description;	/* i: interface description */
 #ifdef _KERNEL /* XXX kvm(3) */
@@ -1108,7 +1108,7 @@ int	ifpromisc_locked(struct ifnet *, int);
 int	if_addr_init(ifnet_t *, struct ifaddr *, bool);
 int	if_do_dad(struct ifnet *);
 int	if_mcast_op(ifnet_t *, const unsigned long, const struct sockaddr *);
-int	if_flags_set(struct ifnet *, const short);
+int	if_flags_set(struct ifnet *, const u_short);
 int	if_clone_list(int, char *, int *);
 
 struct	ifnet *ifunit(const char *);
diff --git a/sys/net/if_ipsec.c b/sys/net/if_ipsec.c
index 34f997752bca..be609e293d55 100644
--- a/sys/net/if_ipsec.c
+++ b/sys/net/if_ipsec.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_ipsec.c,v 1.22 2019/06/25 12:30:50 msaitoh Exp $  */
+/*	$NetBSD: if_ipsec.c,v 1.23 2019/09/13 07:55:07 msaitoh Exp $  */
 
 /*
  * Copyright (c) 2017 Internet Initiative Japan Inc.
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_ipsec.c,v 1.22 2019/06/25 12:30:50 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ipsec.c,v 1.23 2019/09/13 07:55:07 msaitoh Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_inet.h"
@@ -94,7 +94,7 @@ static int if_ipsec_encap_detach(struct ipsec_variant *);
 static int if_ipsec_set_tunnel(struct ifnet *,
     struct sockaddr *, struct sockaddr *);
 static void if_ipsec_delete_tunnel(struct ifnet *);
-static int if_ipsec_ensure_flags(struct ifnet *, short);
+static int if_ipsec_ensure_flags(struct ifnet *, u_short);
 static void if_ipsec_attach0(struct ipsec_softc *);
 
 static int if_ipsec_update_variant(struct ipsec_softc *,
@@ -550,7 +550,7 @@ if_ipsec_ioctl(struct ifnet *ifp, u_long cmd, void *data)
 	int error = 0, size;
 	struct sockaddr *dst, *src;
 	u_long mtu;
-	short oflags = ifp->if_flags;
+	u_short oflags = ifp->if_flags;
 	int bound;
 	struct psref psref;
 
@@ -1162,7 +1162,7 @@ if_ipsec_delete_tunnel(struct ifnet *ifp)
  *               NOTE: use the same encap_cookies.
  */
 static int
-if_ipsec_ensure_flags(struct ifnet *ifp, short oflags)
+if_ipsec_ensure_flags(struct ifnet *ifp, u_short oflags)
 {
 	struct ipsec_softc *sc = ifp->if_softc;
 	struct ipsec_variant *ovar, *nvar, *nullvar;
diff --git a/sys/net/if_spppsubr.c b/sys/net/if_spppsubr.c
index 75eebd4a4c3c..1b712f12193e 100644
--- a/sys/net/if_spppsubr.c
+++ b/sys/net/if_spppsubr.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_spppsubr.c,v 1.183 2019/07/11 03:49:51 msaitoh Exp $	 */
+/*	$NetBSD: if_spppsubr.c,v 1.184 2019/09/13 07:55:07 msaitoh Exp $	 */
 
 /*
  * Synchronous PPP/Cisco link level subroutines.
@@ -41,7 +41,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_spppsubr.c,v 1.183 2019/07/11 03:49:51 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_spppsubr.c,v 1.184 2019/09/13 07:55:07 msaitoh Exp $");
 
 #if defined(_KERNEL_OPT)
 #include "opt_inet.h"
@@ -1172,7 +1172,8 @@ sppp_ioctl(struct ifnet *ifp, u_long cmd, void *data)
 	struct ifreq *ifr = (struct ifreq *) data;
 	struct ifaddr *ifa = (struct ifaddr *) data;
 	struct sppp *sp = (struct sppp *) ifp;
-	int s, error=0, going_up, going_down, newmode;
+	int s, error=0, going_up, going_down;
+	u_short newmode;
 
 	s = splnet();
 	switch (cmd) {