diff options
| author | Christian Weisgerber <naddy@cvs.openbsd.org> | 2009-06-02 03:58:18 +0000 |
|---|---|---|
| committer | Christian Weisgerber <naddy@cvs.openbsd.org> | 2009-06-02 03:58:18 +0000 |
| commit | fb2ed5d50c172e0e939132ae06da51b7bd2d339e (patch) | |
| tree | 8571554df7ecd016e05db9ad2328d0d1f4331677 /sys/dev/pci | |
| parent | 0787e9a47e441fec4e2335f39cff560e2de52e02 (diff) | |
minor tidying; from Brad; ok sthen@
Diffstat (limited to 'sys/dev/pci')
| -rw-r--r-- | sys/dev/pci/if_bge.c | 5 | ||||
| -rw-r--r-- | sys/dev/pci/if_bgereg.h | 3 |
2 files changed, 3 insertions, 5 deletions
diff --git a/sys/dev/pci/if_bge.c b/sys/dev/pci/if_bge.c index fe0538d2832..316a8f665ec 100644 --- a/sys/dev/pci/if_bge.c +++ b/sys/dev/pci/if_bge.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_bge.c,v 1.265 2009/06/02 02:16:41 sthen Exp $ */ +/* $OpenBSD: if_bge.c,v 1.266 2009/06/02 03:58:17 naddy Exp $ */ /* * Copyright (c) 2001 Wind River Systems @@ -3363,14 +3363,13 @@ bge_ioctl(struct ifnet *ifp, u_long command, caddr_t data) case SIOCSIFFLAGS: if (ifp->if_flags & IFF_UP) { if (ifp->if_flags & IFF_RUNNING) - bge_iff(sc); + error = ENETRESET; else bge_init(sc); } else { if (ifp->if_flags & IFF_RUNNING) bge_stop(sc); } - sc->bge_if_flags = ifp->if_flags; break; case SIOCSIFMEDIA: diff --git a/sys/dev/pci/if_bgereg.h b/sys/dev/pci/if_bgereg.h index 7520d56e98c..a9860f1b636 100644 --- a/sys/dev/pci/if_bgereg.h +++ b/sys/dev/pci/if_bgereg.h @@ -1,4 +1,4 @@ -/* $OpenBSD: if_bgereg.h,v 1.92 2009/05/21 23:04:20 sthen Exp $ */ +/* $OpenBSD: if_bgereg.h,v 1.93 2009/06/02 03:58:17 naddy Exp $ */ /* * Copyright (c) 2001 Wind River Systems @@ -2494,7 +2494,6 @@ struct bge_softc { #define BGE_STS_SETBIT(sc, x) ((sc)->bge_sts |= (x)) #define BGE_STS_CLRBIT(sc, x) ((sc)->bge_sts &= ~(x)) int bge_flowflags; - int bge_if_flags; int bge_txcnt; struct timeout bge_timeout; struct timeout bge_rxtimeout; |