d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

change a variable name ot stop it from colliding with other names in

Browse Source 
some situations. (i.e. in vimage)

MFC after:	1 week
This commit is contained in:
Julian Elischer 2008-06-26 22:59:49 +00:00
parent 9dcc73ed79
commit a54eadd8c4
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
sys/net/if_gre.c
View File

@ -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;
}