Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/net if_flags is neither int nor short. It's unsigned short.



details:   https://anonhg.NetBSD.org/src/rev/b3e7b522ea3d
branches:  trunk
changeset: 965332:b3e7b522ea3d
user:      msaitoh <msaitoh%NetBSD.org@localhost>
date:      Fri Sep 13 07:55:05 2019 +0000

description:
if_flags is neither int nor short. It's unsigned short.

diffstat:

 sys/arch/acorn32/podulebus/if_ie.c       |   6 +++---
 sys/arch/arm/imx/if_enet.c               |   6 +++---
 sys/arch/arm/imx/if_enetvar.h            |   4 ++--
 sys/arch/arm/xscale/ixp425_if_npe.c      |   8 ++++----
 sys/arch/mac68k/nubus/if_netdock_nubus.c |   8 ++++----
 sys/arch/mips/atheros/dev/aevar.h        |   4 ++--
 sys/arch/mips/atheros/dev/if_ae.c        |   6 +++---
 sys/arch/mips/sibyte/dev/sbmac.c         |   6 +++---
 sys/arch/newsmips/apbus/if_sn.c          |   8 ++++----
 sys/arch/sun3/dev/if_ievar.h             |   4 ++--
 sys/dev/ic/athnvar.h                     |   4 ++--
 sys/dev/ic/dwc_gmac.c                    |   6 +++---
 sys/dev/ic/dwc_gmac_var.h                |   4 ++--
 sys/dev/ic/elinkxl.c                     |   6 +++---
 sys/dev/ic/elinkxlvar.h                  |   4 ++--
 sys/dev/ic/gem.c                         |   6 +++---
 sys/dev/ic/gemvar.h                      |   4 ++--
 sys/dev/ic/tulip.c                       |   6 +++---
 sys/dev/ic/tulipvar.h                    |   4 ++--
 sys/dev/isa/if_iy.c                      |   6 +++---
 sys/dev/marvell/if_mvgbe.c               |   8 ++++----
 sys/dev/marvell/if_mvxpe.c               |   6 +++---
 sys/dev/marvell/if_mvxpevar.h            |   4 ++--
 sys/dev/pci/cxgb/cxgb_adapter.h          |   2 +-
 sys/dev/pci/if_bge.c                     |   6 +++---
 sys/dev/pci/if_bgevar.h                  |   4 ++--
 sys/dev/pci/if_etreg.h                   |   4 ++--
 sys/dev/pci/if_mskvar.h                  |   4 ++--
 sys/dev/pci/if_nfe.c                     |   6 +++---
 sys/dev/pci/if_nfevar.h                  |   4 ++--
 sys/dev/pci/if_sip.c                     |   8 ++++----
 sys/dev/pci/if_skvar.h                   |   4 ++--
 sys/dev/pci/if_tireg.h                   |   4 ++--
 sys/dev/pci/if_vge.c                     |   8 ++++----
 sys/dev/pci/if_vr.c                      |   6 +++---
 sys/dev/pci/if_wm.c                      |   9 +++++----
 sys/dev/pci/ixgbe/ixgbe.c                |   5 +++--
 sys/dev/pci/ixgbe/ixgbe.h                |   4 ++--
 sys/dev/pci/ixgbe/ixv.c                  |   5 +++--
 sys/dev/usb/if_otusvar.h                 |   4 ++--
 sys/dev/usb/usbnet.c                     |   8 ++++----
 sys/net/if.c                             |  12 ++++++------
 sys/net/if.h                             |   6 +++---
 sys/net/if_ipsec.c                       |  10 +++++-----
 sys/net/if_spppsubr.c                    |   7 ++++---
 45 files changed, 131 insertions(+), 127 deletions(-)

diffs (truncated from 1151 to 300 lines):

diff -r 9cb7d48a8726 -r b3e7b522ea3d sys/arch/acorn32/podulebus/if_ie.c
--- a/sys/arch/acorn32/podulebus/if_ie.c        Fri Sep 13 07:47:39 2019 +0000
+++ b/sys/arch/acorn32/podulebus/if_ie.c        Fri Sep 13 07:55:05 2019 +0000
@@ -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 @@
        int             sc_ram;
        int             sc_control;
        struct ethercom sc_ethercom;
-       int             promisc;
+       u_short         promisc;
        int             sc_irqmode;
 
        u_long  rframes[NFRAMES];
diff -r 9cb7d48a8726 -r b3e7b522ea3d sys/arch/arm/imx/if_enet.c
--- a/sys/arch/arm/imx/if_enet.c        Fri Sep 13 07:47:39 2019 +0000
+++ b/sys/arch/arm/imx/if_enet.c        Fri Sep 13 07:55:05 2019 +0000
@@ -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@localhost>
@@ -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 @@
 {
        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 -r 9cb7d48a8726 -r b3e7b522ea3d sys/arch/arm/imx/if_enetvar.h
--- a/sys/arch/arm/imx/if_enetvar.h     Fri Sep 13 07:47:39 2019 +0000
+++ b/sys/arch/arm/imx/if_enetvar.h     Fri Sep 13 07:55:05 2019 +0000
@@ -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@localhost>
@@ -85,7 +85,7 @@
        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 -r 9cb7d48a8726 -r b3e7b522ea3d sys/arch/arm/xscale/ixp425_if_npe.c
--- a/sys/arch/arm/xscale/ixp425_if_npe.c       Fri Sep 13 07:47:39 2019 +0000
+++ b/sys/arch/arm/xscale/ixp425_if_npe.c       Fri Sep 13 07:55:05 2019 +0000
@@ -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 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 @@
                         */
                        error = (*ifp->if_init)(ifp);
                } else if ((ifp->if_flags & IFF_UP) != 0) {
-                       int diff;
+                       u_short diff;
 
                        /* Up (AND RUNNING). */
 
diff -r 9cb7d48a8726 -r b3e7b522ea3d sys/arch/mac68k/nubus/if_netdock_nubus.c
--- a/sys/arch/mac68k/nubus/if_netdock_nubus.c  Fri Sep 13 07:47:39 2019 +0000
+++ b/sys/arch/mac68k/nubus/if_netdock_nubus.c  Fri Sep 13 07:55:05 2019 +0000
@@ -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@localhost>
@@ -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 @@
        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 @@
 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 -r 9cb7d48a8726 -r b3e7b522ea3d sys/arch/mips/atheros/dev/aevar.h
--- a/sys/arch/mips/atheros/dev/aevar.h Fri Sep 13 07:47:39 2019 +0000
+++ b/sys/arch/mips/atheros/dev/aevar.h Fri Sep 13 07:55:05 2019 +0000
@@ -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_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 -r 9cb7d48a8726 -r b3e7b522ea3d sys/arch/mips/atheros/dev/if_ae.c
--- a/sys/arch/mips/atheros/dev/if_ae.c Fri Sep 13 07:47:39 2019 +0000
+++ b/sys/arch/mips/atheros/dev/if_ae.c Fri Sep 13 07:55:05 2019 +0000
@@ -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 @@
 {
        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 -r 9cb7d48a8726 -r b3e7b522ea3d sys/arch/mips/sibyte/dev/sbmac.c
--- a/sys/arch/mips/sibyte/dev/sbmac.c  Fri Sep 13 07:47:39 2019 +0000
+++ b/sys/arch/mips/sibyte/dev/sbmac.c  Fri Sep 13 07:55:05 2019 +0000
@@ -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 callout  sc_tick_ch;
 
        device_t        sc_dev;         /* device */
-       int             sbm_if_flags;
+       u_short         sbm_if_flags;
        void            *sbm_intrhand;
 
        /*
diff -r 9cb7d48a8726 -r b3e7b522ea3d sys/arch/newsmips/apbus/if_sn.c
--- a/sys/arch/newsmips/apbus/if_sn.c   Fri Sep 13 07:47:39 2019 +0000
+++ b/sys/arch/newsmips/apbus/if_sn.c   Fri Sep 13 07:55:05 2019 +0000
@@ -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 @@
        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 @@
 {
        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 -r 9cb7d48a8726 -r b3e7b522ea3d sys/arch/sun3/dev/if_ievar.h
--- a/sys/arch/sun3/dev/if_ievar.h      Fri Sep 13 07:47:39 2019 +0000
+++ b/sys/arch/sun3/dev/if_ievar.h      Fri Sep 13 07:55:05 2019 +0000
@@ -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 @@
        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 -r 9cb7d48a8726 -r b3e7b522ea3d sys/dev/ic/athnvar.h
--- a/sys/dev/ic/athnvar.h      Fri Sep 13 07:47:39 2019 +0000
+++ b/sys/dev/ic/athnvar.h      Fri Sep 13 07:55:05 2019 +0000
@@ -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 @@
        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 -r 9cb7d48a8726 -r b3e7b522ea3d sys/dev/ic/dwc_gmac.c
--- a/sys/dev/ic/dwc_gmac.c     Fri Sep 13 07:47:39 2019 +0000
+++ b/sys/dev/ic/dwc_gmac.c     Fri Sep 13 07:55:05 2019 +0000
@@ -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>



Home | Main Index | Thread Index | Old Index