Deleted Added
full compact
if_gre.h (204522) if_gre.h (223223)
1/* $NetBSD: if_gre.h,v 1.13 2003/11/10 08:51:52 wiz Exp $ */
1/* $NetBSD: if_gre.h,v 1.13 2003/11/10 08:51:52 wiz Exp $ */
2/* $FreeBSD: head/sys/net/if_gre.h 204522 2010-03-01 17:05:46Z joel $ */
2/* $FreeBSD: head/sys/net/if_gre.h 223223 2011-06-18 09:34:03Z bz $ */
3
4/*-
5 * Copyright (c) 1998 The NetBSD Foundation, Inc.
6 * All rights reserved
7 *
8 * This code is derived from software contributed to The NetBSD Foundation
9 * by Heiko W.Rupp <hwr@pilhuhn.de>
10 *

--- 45 unchanged lines hidden (view full) ---

56 struct in_addr g_src; /* source address of gre packets */
57 struct in_addr g_dst; /* destination address of gre packets */
58 struct route route; /* routing entry that determines, where a
59 encapsulated packet should go */
60 u_char g_proto; /* protocol of encapsulator */
61
62 const struct encaptab *encap; /* encapsulation cookie */
63
3
4/*-
5 * Copyright (c) 1998 The NetBSD Foundation, Inc.
6 * All rights reserved
7 *
8 * This code is derived from software contributed to The NetBSD Foundation
9 * by Heiko W.Rupp <hwr@pilhuhn.de>
10 *

--- 45 unchanged lines hidden (view full) ---

56 struct in_addr g_src; /* source address of gre packets */
57 struct in_addr g_dst; /* destination address of gre packets */
58 struct route route; /* routing entry that determines, where a
59 encapsulated packet should go */
60 u_char g_proto; /* protocol of encapsulator */
61
62 const struct encaptab *encap; /* encapsulation cookie */
63
64 int called; /* infinite recursion preventer */
65
66 uint32_t key; /* key included in outgoing GRE packets */
67 /* zero means none */
68
69 wccp_ver_t wccp_ver; /* version of the WCCP */
70};
71#define GRE2IFP(sc) ((sc)->sc_ifp)
72
73

--- 114 unchanged lines hidden ---
64 uint32_t key; /* key included in outgoing GRE packets */
65 /* zero means none */
66
67 wccp_ver_t wccp_ver; /* version of the WCCP */
68};
69#define GRE2IFP(sc) ((sc)->sc_ifp)
70
71

--- 114 unchanged lines hidden ---