Deleted Added
full compact
if_gif.c (195699) if_gif.c (195727)
1/* $FreeBSD: head/sys/net/if_gif.c 195699 2009-07-14 22:48:30Z rwatson $ */
1/* $FreeBSD: head/sys/net/if_gif.c 195727 2009-07-16 21:13:04Z rwatson $ */
2/* $KAME: if_gif.c,v 1.87 2001/10/19 08:50:27 itojun Exp $ */
3
4/*-
5 * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
6 * All rights reserved.
7 *
8 * Redistribution and use in source and binary forms, with or without
9 * modification, are permitted provided that the following conditions

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

94 */
95static struct mtx gif_mtx;
96static MALLOC_DEFINE(M_GIF, "gif", "Generic Tunnel Interface");
97
98static VNET_DEFINE(LIST_HEAD(, gif_softc), gif_softc_list);
99static VNET_DEFINE(int, max_gif_nesting);
100static VNET_DEFINE(int, parallel_tunnels);
101
2/* $KAME: if_gif.c,v 1.87 2001/10/19 08:50:27 itojun Exp $ */
3
4/*-
5 * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
6 * All rights reserved.
7 *
8 * Redistribution and use in source and binary forms, with or without
9 * modification, are permitted provided that the following conditions

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

94 */
95static struct mtx gif_mtx;
96static MALLOC_DEFINE(M_GIF, "gif", "Generic Tunnel Interface");
97
98static VNET_DEFINE(LIST_HEAD(, gif_softc), gif_softc_list);
99static VNET_DEFINE(int, max_gif_nesting);
100static VNET_DEFINE(int, parallel_tunnels);
101
102#define V_gif_softc_list VNET_GET(gif_softc_list)
103#define V_max_gif_nesting VNET_GET(max_gif_nesting)
104#define V_parallel_tunnels VNET_GET(parallel_tunnels)
102#define V_gif_softc_list VNET(gif_softc_list)
103#define V_max_gif_nesting VNET(max_gif_nesting)
104#define V_parallel_tunnels VNET(parallel_tunnels)
105
106#ifdef INET
107VNET_DEFINE(int, ip_gif_ttl);
105
106#ifdef INET
107VNET_DEFINE(int, ip_gif_ttl);
108#define V_ip_gif_ttl VNET_GET(ip_gif_ttl)
108#define V_ip_gif_ttl VNET(ip_gif_ttl)
109#endif
110#ifdef INET6
111VNET_DEFINE(int, ip6_gif_hlim);
109#endif
110#ifdef INET6
111VNET_DEFINE(int, ip6_gif_hlim);
112#define V_ip6_gif_hlim VNET_GET(ip6_gif_hlim)
112#define V_ip6_gif_hlim VNET(ip6_gif_hlim)
113#endif
114
115void (*ng_gif_input_p)(struct ifnet *ifp, struct mbuf **mp, int af);
116void (*ng_gif_input_orphan_p)(struct ifnet *ifp, struct mbuf *m, int af);
117void (*ng_gif_attach_p)(struct ifnet *ifp);
118void (*ng_gif_detach_p)(struct ifnet *ifp);
119
120static void gif_start(struct ifnet *);

--- 947 unchanged lines hidden ---
113#endif
114
115void (*ng_gif_input_p)(struct ifnet *ifp, struct mbuf **mp, int af);
116void (*ng_gif_input_orphan_p)(struct ifnet *ifp, struct mbuf *m, int af);
117void (*ng_gif_attach_p)(struct ifnet *ifp);
118void (*ng_gif_detach_p)(struct ifnet *ifp);
119
120static void gif_start(struct ifnet *);

--- 947 unchanged lines hidden ---