Deleted Added
full compact
if_gre.h (139823) if_gre.h (147256)
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 139823 2005-01-07 01:45:51Z imp $ */
2/* $FreeBSD: head/sys/net/if_gre.h 147256 2005-06-10 16:49:24Z brooks $ */
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 *

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

50 * with additional 4-bytes field.
51 */
52typedef enum {
53 WCCP_V1 = 0,
54 WCCP_V2
55} wccp_ver_t;
56
57struct gre_softc {
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 *

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

50 * with additional 4-bytes field.
51 */
52typedef enum {
53 WCCP_V1 = 0,
54 WCCP_V2
55} wccp_ver_t;
56
57struct gre_softc {
58 struct ifnet sc_if;
58 struct ifnet *sc_ifp;
59 LIST_ENTRY(gre_softc) sc_list;
60 int gre_unit;
61 int gre_flags;
62 struct in_addr g_src; /* source address of gre packets */
63 struct in_addr g_dst; /* destination address of gre packets */
64 struct route route; /* routing entry that determines, where a
65 encapsulated packet should go */
66 u_char g_proto; /* protocol of encapsulator */
67
68 const struct encaptab *encap; /* encapsulation cookie */
69
70 int called; /* infinite recursion preventer */
71
72 wccp_ver_t wccp_ver; /* version of the WCCP */
73};
59 LIST_ENTRY(gre_softc) sc_list;
60 int gre_unit;
61 int gre_flags;
62 struct in_addr g_src; /* source address of gre packets */
63 struct in_addr g_dst; /* destination address of gre packets */
64 struct route route; /* routing entry that determines, where a
65 encapsulated packet should go */
66 u_char g_proto; /* protocol of encapsulator */
67
68 const struct encaptab *encap; /* encapsulation cookie */
69
70 int called; /* infinite recursion preventer */
71
72 wccp_ver_t wccp_ver; /* version of the WCCP */
73};
74#define GRE2IFP(sc) ((sc)->sc_ifp)
74
75
76struct gre_h {
77 u_int16_t flags; /* GRE flags */
78 u_int16_t ptype; /* protocol type of payload typically
79 Ether protocol type*/
80/*
81 * from here on: fields are optional, presence indicated by flags

--- 104 unchanged lines hidden ---
75
76
77struct gre_h {
78 u_int16_t flags; /* GRE flags */
79 u_int16_t ptype; /* protocol type of payload typically
80 Ether protocol type*/
81/*
82 * from here on: fields are optional, presence indicated by flags

--- 104 unchanged lines hidden ---