Deleted Added
full compact
if_gre.h (274246) if_gre.h (276215)
1/*-
2 * Copyright (c) 1998 The NetBSD Foundation, Inc.
3 * Copyright (c) 2014 Andrey V. Elsukov <ae@FreeBSD.org>
4 * All rights reserved
5 *
6 * This code is derived from software contributed to The NetBSD Foundation
7 * by Heiko W.Rupp <hwr@pilhuhn.de>
8 *

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

23 * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
24 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
25 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
26 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
27 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
28 * POSSIBILITY OF SUCH DAMAGE.
29 *
30 * $NetBSD: if_gre.h,v 1.13 2003/11/10 08:51:52 wiz Exp $
1/*-
2 * Copyright (c) 1998 The NetBSD Foundation, Inc.
3 * Copyright (c) 2014 Andrey V. Elsukov <ae@FreeBSD.org>
4 * All rights reserved
5 *
6 * This code is derived from software contributed to The NetBSD Foundation
7 * by Heiko W.Rupp <hwr@pilhuhn.de>
8 *

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

23 * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
24 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
25 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
26 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
27 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
28 * POSSIBILITY OF SUCH DAMAGE.
29 *
30 * $NetBSD: if_gre.h,v 1.13 2003/11/10 08:51:52 wiz Exp $
31 * $FreeBSD: head/sys/net/if_gre.h 274246 2014-11-07 19:13:19Z ae $
31 * $FreeBSD: head/sys/net/if_gre.h 276215 2014-12-25 21:32:37Z ae $
32 */
33
34#ifndef _NET_IF_GRE_H_
35#define _NET_IF_GRE_H_
36
37#ifdef _KERNEL
38/* GRE header according to RFC 2784 and RFC 2890 */
39struct grehdr {

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

95#define GRE_WLOCK_ASSERT(sc) rm_assert(&(sc)->gre_lock, RA_WLOCKED)
96
97#define gre_hdr gre_uhdr.hdr
98#define gre_gihdr gre_uhdr.gihdr
99#define gre_gi6hdr gre_uhdr.gi6hdr
100#define gre_oip gre_gihdr->gi_ip
101#define gre_oip6 gre_gi6hdr->gi6_ip6
102
32 */
33
34#ifndef _NET_IF_GRE_H_
35#define _NET_IF_GRE_H_
36
37#ifdef _KERNEL
38/* GRE header according to RFC 2784 and RFC 2890 */
39struct grehdr {

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

95#define GRE_WLOCK_ASSERT(sc) rm_assert(&(sc)->gre_lock, RA_WLOCKED)
96
97#define gre_hdr gre_uhdr.hdr
98#define gre_gihdr gre_uhdr.gihdr
99#define gre_gi6hdr gre_uhdr.gi6hdr
100#define gre_oip gre_gihdr->gi_ip
101#define gre_oip6 gre_gi6hdr->gi6_ip6
102
103int gre_input(struct mbuf **, int *, int);
104#ifdef INET
105int in_gre_attach(struct gre_softc *);
106int in_gre_output(struct mbuf *, int, int);
107#endif
108#ifdef INET6
109int in6_gre_attach(struct gre_softc *);
110int in6_gre_output(struct mbuf *, int, int);
111#endif
103/*
104 * CISCO uses special type for GRE tunnel created as part of WCCP
105 * connection, while in fact those packets are just IPv4 encapsulated
106 * into GRE.
107 */
108#define ETHERTYPE_WCCP 0x883E
109#endif /* _KERNEL */
110

--- 17 unchanged lines hidden ---
112/*
113 * CISCO uses special type for GRE tunnel created as part of WCCP
114 * connection, while in fact those packets are just IPv4 encapsulated
115 * into GRE.
116 */
117#define ETHERTYPE_WCCP 0x883E
118#endif /* _KERNEL */
119

--- 17 unchanged lines hidden ---