diff options
| author | julian <julian@FreeBSD.org> | 2008-06-26 22:59:49 +0000 |
|---|---|---|
| committer | julian <julian@FreeBSD.org> | 2008-06-26 22:59:49 +0000 |
| commit | 74854699d26c7fb406a5e0029641de33e278cbce (patch) | |
| tree | 143ae8b6a351abe2927fff3e805c156aed8c4986 /sys/net/if_gre.c | |
| parent | e62e07212194d68f68d086e7612a9c78947ba772 (diff) | |
| download | FreeBSD-src-74854699d26c7fb406a5e0029641de33e278cbce.zip FreeBSD-src-74854699d26c7fb406a5e0029641de33e278cbce.tar.gz | |
change a variable name ot stop it from colliding with other names in
some situations. (i.e. in vimage)
MFC after: 1 week
Diffstat (limited to 'sys/net/if_gre.c')
| -rw-r--r-- | sys/net/if_gre.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/sys/net/if_gre.c b/sys/net/if_gre.c index ff39b1d..ea6c0c0 100644 --- a/sys/net/if_gre.c +++ b/sys/net/if_gre.c @@ -245,8 +245,8 @@ gre_output(struct ifnet *ifp, struct mbuf *m, struct sockaddr *dst, struct gre_softc *sc = ifp->if_softc; struct greip *gh; struct ip *ip; - u_short ip_id = 0; - uint8_t ip_tos = 0; + u_short gre_ip_id = 0; + uint8_t gre_ip_tos = 0; u_int16_t etype = 0; struct mobile_h mob_h; u_int32_t af; @@ -363,13 +363,13 @@ gre_output(struct ifnet *ifp, struct mbuf *m, struct sockaddr *dst, switch (dst->sa_family) { case AF_INET: ip = mtod(m, struct ip *); - ip_tos = ip->ip_tos; - ip_id = ip->ip_id; + gre_ip_tos = ip->ip_tos; + gre_ip_id = ip->ip_id; etype = ETHERTYPE_IP; break; #ifdef INET6 case AF_INET6: - ip_id = ip_newid(); + gre_ip_id = ip_newid(); etype = ETHERTYPE_IPV6; break; #endif @@ -428,8 +428,8 @@ gre_output(struct ifnet *ifp, struct mbuf *m, struct sockaddr *dst, ((struct ip*)gh)->ip_v = IPPROTO_IPV4; ((struct ip*)gh)->ip_hl = (sizeof(struct ip)) >> 2; ((struct ip*)gh)->ip_ttl = GRE_TTL; - ((struct ip*)gh)->ip_tos = ip_tos; - ((struct ip*)gh)->ip_id = ip_id; + ((struct ip*)gh)->ip_tos = gre_ip_tos; + ((struct ip*)gh)->ip_id = gre_ip_id; gh->gi_len = m->m_pkthdr.len; } |
