diff options
| author | Jun-ichiro itojun Hagino <itojun@cvs.openbsd.org> | 2001-07-27 15:48:39 +0000 |
|---|---|---|
| committer | Jun-ichiro itojun Hagino <itojun@cvs.openbsd.org> | 2001-07-27 15:48:39 +0000 |
| commit | 5782dfd1a8b36a27deb2bd3798e6d6a9afe9a7a1 (patch) | |
| tree | c2e0ac3c8c5fc71c9f37c6b9d4eda10d41ea7c30 /sys/net/if_gif.c | |
| parent | 94e300c7c1502fce5abee5638ced501881fa0d9c (diff) | |
variable name "gif" is way too generic - use "gif_softc". sync with kame
Diffstat (limited to 'sys/net/if_gif.c')
| -rw-r--r-- | sys/net/if_gif.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/sys/net/if_gif.c b/sys/net/if_gif.c index a048d13b077..1ee0743c5ea 100644 --- a/sys/net/if_gif.c +++ b/sys/net/if_gif.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_gif.c,v 1.19 2001/06/25 06:33:48 angelos Exp $ */ +/* $OpenBSD: if_gif.c,v 1.20 2001/07/27 15:48:38 itojun Exp $ */ /* $KAME: if_gif.c,v 1.43 2001/02/20 08:51:07 itojun Exp $ */ /* @@ -69,7 +69,7 @@ void gifattach __P((int)); /* * gif global variable definitions */ -struct gif_softc *gif = 0; +struct gif_softc *gif_softc = 0; void gifattach(n) @@ -79,7 +79,8 @@ gifattach(n) register int i; ngif = n; - gif = sc = malloc (ngif * sizeof(struct gif_softc), M_DEVBUF, M_WAIT); + gif_softc = sc = malloc (ngif * sizeof(struct gif_softc), + M_DEVBUF, M_WAIT); bzero(sc, ngif * sizeof(struct gif_softc)); for (i = 0; i < ngif; sc++, i++) { sprintf(sc->gif_if.if_xname, "gif%d", i); @@ -354,7 +355,7 @@ gif_ioctl(ifp, cmd, data) } for (i = 0; i < ngif; i++) { - sc2 = gif + i; + sc2 = gif_softc + i; if (sc2 == sc) continue; if (!sc2->gif_pdst || !sc2->gif_psrc) |