diff options
| author | Brad Smith <brad@cvs.openbsd.org> | 2004-02-02 08:40:49 +0000 |
|---|---|---|
| committer | Brad Smith <brad@cvs.openbsd.org> | 2004-02-02 08:40:49 +0000 |
| commit | fdda9b8398a74c61c52b252b419cb0805bce06b2 (patch) | |
| tree | c558674edc01c8e7d8e76db085d4d7fa646a4c63 /sys/dev/ic/gem.c | |
| parent | 690938ac837e828b61bcb01d54ebd61d072c82d9 (diff) | |
Don't return random garbage in the default case; return the smallest ring
descriptor instead.
From NetBSD
ok deraadt@
Diffstat (limited to 'sys/dev/ic/gem.c')
| -rw-r--r-- | sys/dev/ic/gem.c | 41 |
1 files changed, 14 insertions, 27 deletions
diff --git a/sys/dev/ic/gem.c b/sys/dev/ic/gem.c index 7703d08efb0..648b3938698 100644 --- a/sys/dev/ic/gem.c +++ b/sys/dev/ic/gem.c @@ -1,4 +1,4 @@ -/* $OpenBSD: gem.c,v 1.36 2004/02/01 07:00:25 brad Exp $ */ +/* $OpenBSD: gem.c,v 1.37 2004/02/02 08:40:48 brad Exp $ */ /* $NetBSD: gem.c,v 1.1 2001/09/16 00:11:43 eeh Exp $ */ /* @@ -669,42 +669,29 @@ gem_meminit(struct gem_softc *sc) static int gem_ringsize(int sz) { - int v; - switch (sz) { case 32: - v = GEM_RING_SZ_32; - break; + return GEM_RING_SZ_32; case 64: - v = GEM_RING_SZ_64; - break; + return GEM_RING_SZ_64; case 128: - v = GEM_RING_SZ_128; - break; + return GEM_RING_SZ_128; case 256: - v = GEM_RING_SZ_256; - break; + return GEM_RING_SZ_256; case 512: - v = GEM_RING_SZ_512; - break; + return GEM_RING_SZ_512; case 1024: - v = GEM_RING_SZ_1024; - break; + return GEM_RING_SZ_1024; case 2048: - v = GEM_RING_SZ_2048; - break; + return GEM_RING_SZ_2048; case 4096: - v = GEM_RING_SZ_4096; - break; + return GEM_RING_SZ_4096; case 8192: - v = GEM_RING_SZ_8192; - break; + return GEM_RING_SZ_8192; default: - v = GEM_RING_SZ_32; - printf("gem: invalid Receive Descriptor ring size\n"); - break; + printf("gem: invalid Receive Descriptor ring size %d\n", sz); + return GEM_RING_SZ_32; } - return (v); } /* @@ -1206,7 +1193,7 @@ gem_mii_readreg(self, phy, reg) int n; u_int32_t v; -#ifdef GEM_DEBUG1 +#ifdef GEM_DEBUG if (sc->sc_debug) printf("gem_mii_readreg: phy %d reg %d\n", phy, reg); #endif @@ -1238,7 +1225,7 @@ gem_mii_writereg(self, phy, reg, val) int n; u_int32_t v; -#ifdef GEM_DEBUG1 +#ifdef GEM_DEBUG if (sc->sc_debug) printf("gem_mii_writereg: phy %d reg %d val %x\n", phy, reg, val); |