variable name "gif" is way too generic - use "gif_softc". sync with kame

5 files changed, 21 insertions, 19 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)
diff --git a/sys/net/if_gif.h b/sys/net/if_gif.h
index dff8955e6ee..f64b43a7427 100644
--- a/sys/net/if_gif.h
+++ b/sys/net/if_gif.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_gif.h,v 1.5 2001/02/16 08:48:03 itojun Exp $	*/
+/*	$OpenBSD: if_gif.h,v 1.6 2001/07/27 15:48:38 itojun Exp $	*/
 /*	$KAME: if_gif.h,v 1.17 2000/09/11 11:36:41 sumikawa Exp $	*/
 
 /*
@@ -66,7 +66,7 @@ struct gif_softc {
 #define	GIF_MTU_MAX	(8192)	/* Maximum MTU */
 
 extern int ngif;
-extern struct gif_softc *gif;
+extern struct gif_softc *gif_softc;
 
 /* Prototypes */
 int gif_output __P((struct ifnet *, struct mbuf *,
diff --git a/sys/netinet/in_gif.c b/sys/netinet/in_gif.c
index 2b68ded2f92..7b48276257c 100644
--- a/sys/netinet/in_gif.c
+++ b/sys/netinet/in_gif.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: in_gif.c,v 1.19 2001/06/08 10:37:46 art Exp $	*/
+/*	$OpenBSD: in_gif.c,v 1.20 2001/07/27 15:48:38 itojun Exp $	*/
 /*	$KAME: in_gif.c,v 1.50 2001/01/22 07:27:16 itojun Exp $	*/
 
 /*
@@ -197,7 +197,7 @@ in_gif_input(m, va_alist)
 
 	/* this code will be soon improved. */
 #define	satosin(sa)	((struct sockaddr_in *)(sa))	
-	for (i = 0, sc = gif; i < ngif; i++, sc++) {
+	for (i = 0, sc = gif_softc; i < ngif; i++, sc++) {
 		if (sc->gif_psrc == NULL
 		 || sc->gif_pdst == NULL
 		 || sc->gif_psrc->sa_family != AF_INET
diff --git a/sys/netinet/ip_ether.c b/sys/netinet/ip_ether.c
index 3e60e45206d..8337b755696 100644
--- a/sys/netinet/ip_ether.c
+++ b/sys/netinet/ip_ether.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ip_ether.c,v 1.34 2001/06/27 03:49:53 angelos Exp $  */
+/*	$OpenBSD: ip_ether.c,v 1.35 2001/07/27 15:48:38 itojun Exp $  */
 /*
  * The author of this code is Angelos D. Keromytis (kermit@adk.gr)
  *
@@ -228,13 +228,14 @@ etherip_input(m, va_alist)
 #if NGIF > 0
 	/* Find appropriate gif(4) interface */
 	for (i = 0; i < ngif; i++) {
-		if ((gif[i].gif_psrc == NULL) || (gif[i].gif_pdst == NULL) ||
-		    !(gif[i].gif_if.if_flags & (IFF_UP|IFF_RUNNING)))
+		if ((gif_softc[i].gif_psrc == NULL) ||
+		    (gif_softc[i].gif_pdst == NULL) ||
+		    !(gif_softc[i].gif_if.if_flags & (IFF_UP|IFF_RUNNING)))
 			continue;
 
-		if (!bcmp(gif[i].gif_psrc, &sdst, gif[i].gif_psrc->sa_len) &&
-		    !bcmp(gif[i].gif_pdst, &ssrc, gif[i].gif_pdst->sa_len) &&
-		    gif[i].gif_if.if_bridge != NULL)
+		if (!bcmp(gif_softc[i].gif_psrc, &sdst, gif_softc[i].gif_psrc->sa_len) &&
+		    !bcmp(gif_softc[i].gif_pdst, &ssrc, gif_softc[i].gif_pdst->sa_len) &&
+		    gif_softc[i].gif_if.if_bridge != NULL)
 			break;
 	}
 
@@ -252,12 +253,12 @@ etherip_input(m, va_alist)
 	 * NULL if it has consumed the packet.  In the case of gif's,
 	 * bridge_input() returns non-NULL when an error occurs.
 	 */
-	m->m_pkthdr.rcvif = &gif[i].gif_if;
+	m->m_pkthdr.rcvif = &gif_softc[i].gif_if;
 	if (m->m_flags & (M_BCAST|M_MCAST))
-		gif[i].gif_if.if_imcasts++;
+		gif_softc[i].gif_if.if_imcasts++;
 
 	s = splnet();
-	m = bridge_input(&gif[i].gif_if, &eh, m);
+	m = bridge_input(&gif_softc[i].gif_if, &eh, m);
 	splx(s);
 	if (m == NULL)
 		return;
diff --git a/sys/netinet6/in6_gif.c b/sys/netinet6/in6_gif.c
index a9898012189..591a8c45aa9 100644
--- a/sys/netinet6/in6_gif.c
+++ b/sys/netinet6/in6_gif.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: in6_gif.c,v 1.16 2001/06/09 06:43:37 angelos Exp $	*/
+/*	$OpenBSD: in6_gif.c,v 1.17 2001/07/27 15:48:38 itojun Exp $	*/
 /*	$KAME: in6_gif.c,v 1.43 2001/01/22 07:27:17 itojun Exp $	*/
 
 /*
@@ -218,7 +218,7 @@ int in6_gif_input(mp, offp, proto)
 	ip6 = mtod(m, struct ip6_hdr *);
 
 #define satoin6(sa)	(((struct sockaddr_in6 *)(sa))->sin6_addr)
-	for (i = 0, sc = gif; i < ngif; i++, sc++) {
+	for (i = 0, sc = gif_softc; i < ngif; i++, sc++) {
 		if (sc->gif_psrc == NULL ||
 		    sc->gif_pdst == NULL ||
 		    sc->gif_psrc->sa_family != AF_INET6 ||