2c2
< /* $FreeBSD: head/sys/net/if_gre.c 179894 2008-06-20 17:26:34Z thompsa $ */
---
> /* $FreeBSD: head/sys/net/if_gre.c 180041 2008-06-26 22:59:49Z julian $ */
248,249c248,249
< u_short ip_id = 0;
< uint8_t ip_tos = 0;
---
> u_short gre_ip_id = 0;
> uint8_t gre_ip_tos = 0;
366,367c366,367
< ip_tos = ip->ip_tos;
< ip_id = ip->ip_id;
---
> gre_ip_tos = ip->ip_tos;
> gre_ip_id = ip->ip_id;
372c372
< ip_id = ip_newid();
---
> gre_ip_id = ip_newid();
431,432c431,432
< ((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;