2c2
< /* $FreeBSD: head/sys/net/if_gre.c 147643 2005-06-28 06:55:45Z bz $ */
---
> /* $FreeBSD: head/sys/net/if_gre.c 148613 2005-08-01 08:14:21Z bz $ */
10a11,12
> * IPv6-over-GRE contributed by Gert Doering <gert@greenie.muc.de>
> *
42c44
< * See RFC 1701 and 1702 for more details.
---
> * See RFC 2784 (successor of RFC 1701 and 1702) for more details.
239a242,243
> u_short ip_id = 0;
> uint8_t ip_tos = 0;
354a359,360
> ip_tos = ip->ip_tos;
> ip_id = ip->ip_id;
356a363,368
> #ifdef INET6
> case AF_INET6:
> ip_id = ip_newid();
> etype = ETHERTYPE_IPV6;
> break;
> #endif
396,397c408,409
< ((struct ip*)gh)->ip_tos = ip->ip_tos;
< ((struct ip*)gh)->ip_id = ip->ip_id;
---
> ((struct ip*)gh)->ip_tos = ip_tos;
> ((struct ip*)gh)->ip_id = ip_id;
475a488,491
> #ifdef INET6
> case AF_INET6:
> break;
> #endif