0a1,3
> /* $FreeBSD: head/sys/net/if_gif.h 62587 2000-07-04 16:35:15Z itojun $ */
> /* $KAME: if_gif.h,v 1.13 2000/06/17 20:34:24 itojun Exp $ */
>
28,29d30
< *
< * $FreeBSD: head/sys/net/if_gif.h 54263 1999-12-07 17:39:16Z shin $
38a40,51
>
> #if (defined(__FreeBSD__) && __FreeBSD__ >= 3) || defined(__NetBSD__)
> #if defined(_KERNEL) && !defined(_LKM)
> #include "opt_inet.h"
> #endif
> #endif
>
> #include <netinet/in.h>
> /* xxx sigh, why route have struct route instead of pointer? */
>
> struct encaptab;
>
40,42c53,55
< struct ifnet gif_if; /* common area */
< struct sockaddr *gif_psrc; /* Physical src addr */
< struct sockaddr *gif_pdst; /* Physical dst addr */
---
> struct ifnet gif_if; /* common area - must be at the top */
> struct sockaddr *gif_psrc; /* Physical src addr */
> struct sockaddr *gif_pdst; /* Physical dst addr */
44,45c57,60
< struct route gifscr_ro; /* xxx */
< struct route_in6 gifscr_ro6; /* xxx */
---
> struct route gifscr_ro; /* xxx */
> #ifdef INET6
> struct route_in6 gifscr_ro6; /* xxx */
> #endif
47c62,64
< int gif_flags;
---
> int gif_flags;
> const struct encaptab *encap_cookie4;
> const struct encaptab *encap_cookie6;
50,51c67,70
< #define gif_ro gifsc_gifscr.gifscr_ro
< #define gif_ro6 gifsc_gifscr.gifscr_ro6
---
> #define gif_ro gifsc_gifscr.gifscr_ro
> #ifdef INET6
> #define gif_ro6 gifsc_gifscr.gifscr_ro6
> #endif
53,55c72
< #define GIFF_INUSE 0x1 /* gif is in use */
<
< #define GIF_MTU (1280) /* Default MTU */
---
> #define GIF_MTU (1280) /* Default MTU */
59,61d75
< extern int ngif;
< extern struct gif_softc *gif;
<
63,64c77,78
< void gif_input __P((struct mbuf *, int, struct ifnet *));
< int gif_output __P((struct ifnet *, struct mbuf *,
---
> void gif_input __P((struct mbuf *, int, struct ifnet *));
> int gif_output __P((struct ifnet *, struct mbuf *,
66c80
< int gif_ioctl __P((struct ifnet *, u_long, caddr_t));
---
> int gif_ioctl __P((struct ifnet *, u_long, caddr_t));