1,2c1,2
< /* $NetBSD: if_gre.c,v 1.42 2002/08/14 00:23:27 itojun Exp $ */
< /* $FreeBSD: head/sys/net/if_gre.c 123922 2003-12-28 03:56:00Z sam $ */
---
> /* $NetBSD: if_gre.c,v 1.49 2003/12/11 00:22:29 itojun Exp $ */
> /* $FreeBSD: head/sys/net/if_gre.c 123992 2003-12-30 11:41:43Z sobomax $ */
215,216c215
< u_char osrc;
< u_short etype = 0;
---
> u_int16_t etype = 0;
240d238
< osrc = 0;
285c283
< mob_h.hcrc = gre_in_cksum((u_short *)&mob_h, msiz);
---
> mob_h.hcrc = gre_in_cksum((u_int16_t *)&mob_h, msiz);
368c366
< gh->gi_len = m->m_pkthdr.len;
---
> gh->gi_len = htons(m->m_pkthdr.len);
374c372,373
< error = ip_output(m, NULL, &sc->route, 0, NULL, NULL);
---
> error = ip_output(m, NULL, &sc->route, 0,
> (struct ip_moptions *)NULL, (struct inpcb *)NULL);
623c622
< * gets src=a, dst=b tacked on and would from ip_ouput() sent back to
---
> * gets src=a, dst=b tacked on and would from ip_output() sent back to
659c658
< printf("%s: searching a route to %s", if_name(&sc->sc_if),
---
> printf("%s: searching for a route to %s", if_name(&sc->sc_if),
699,700c698,699
< u_short
< gre_in_cksum(u_short *p, u_int len)
---
> u_int16_t
> gre_in_cksum(u_int16_t *p, u_int len)
702c701
< u_int sum = 0;
---
> u_int32_t sum = 0;