summaryrefslogtreecommitdiffstats
path: root/sys/dev/sbni
diff options
context:
space:
mode:
authormsmith <msmith@FreeBSD.org>2002-01-08 19:36:54 +0000
committermsmith <msmith@FreeBSD.org>2002-01-08 19:36:54 +0000
commit2666545aeb7f6fd3b7579b9fc178ffabcc0badb2 (patch)
treeed48f258e494b6c841fb9a845100ffe6c5fea5aa /sys/dev/sbni
parent2e4f2ddc4e8e2de76c80bd78b600d4181564e546 (diff)
downloadFreeBSD-src-2666545aeb7f6fd3b7579b9fc178ffabcc0badb2.zip
FreeBSD-src-2666545aeb7f6fd3b7579b9fc178ffabcc0badb2.tar.gz
Rename a variable that might accidentally be duplicated elsewhere.
Diffstat (limited to 'sys/dev/sbni')
-rw-r--r--sys/dev/sbni/if_sbni.c4
-rw-r--r--sys/dev/sbni/if_sbni_isa.c4
-rw-r--r--sys/dev/sbni/if_sbnivar.h2
3 files changed, 5 insertions, 5 deletions
diff --git a/sys/dev/sbni/if_sbni.c b/sys/dev/sbni/if_sbni.c
index fd06be3..f4d2887 100644
--- a/sys/dev/sbni/if_sbni.c
+++ b/sys/dev/sbni/if_sbni.c
@@ -116,7 +116,7 @@ static __inline void sbni_outsb(struct sbni_softc *, u_char *, u_int);
static u_int32_t crc32tab[];
#ifdef SBNI_DUAL_COMPOUND
-struct sbni_softc *headlist;
+struct sbni_softc *sbni_headlist;
#endif
u_int32_t next_sbni_unit;
@@ -970,7 +970,7 @@ connect_to_master(struct sbni_softc *sc)
{
struct sbni_softc *p;
- p = (struct sbni_softc *)(((char *)&headlist)
+ p = (struct sbni_softc *)(((char *)&sbni_headlist)
- offsetof(struct sbni_softc, link));
for (; p->link; p = p->link) {
diff --git a/sys/dev/sbni/if_sbni_isa.c b/sys/dev/sbni/if_sbni_isa.c
index a4aefbc..4cc86b9 100644
--- a/sys/dev/sbni/if_sbni_isa.c
+++ b/sys/dev/sbni/if_sbni_isa.c
@@ -141,8 +141,8 @@ sbni_attach_isa(device_t dev)
#else /* SBNI_DUAL_COMPOUND */
- sc->link = headlist;
- headlist = sc;
+ sc->link = sbni_headlist;
+ sbni_headlist = sc;
} else {
struct sbni_softc *master;
diff --git a/sys/dev/sbni/if_sbnivar.h b/sys/dev/sbni/if_sbnivar.h
index 4453251..749a9e6 100644
--- a/sys/dev/sbni/if_sbnivar.h
+++ b/sys/dev/sbni/if_sbnivar.h
@@ -126,7 +126,7 @@ void sbni_attach(struct sbni_softc *, int, struct sbni_flags);
extern u_int32_t next_sbni_unit;
#ifdef SBNI_DUAL_COMPOUND
-extern struct sbni_softc *headlist;
+extern struct sbni_softc *sbni_headlist;
struct sbni_softc *connect_to_master(struct sbni_softc *);
#endif
OpenPOWER on IntegriCloud