Deleted Added
full compact
ip_gre.c (274246) ip_gre.c (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 *

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

28 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
29 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
30 * POSSIBILITY OF SUCH DAMAGE.
31 *
32 * $NetBSD: ip_gre.c,v 1.29 2003/09/05 23:02:43 itojun Exp $
33 */
34
35#include <sys/cdefs.h>
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 *

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

28 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
29 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
30 * POSSIBILITY OF SUCH DAMAGE.
31 *
32 * $NetBSD: ip_gre.c,v 1.29 2003/09/05 23:02:43 itojun Exp $
33 */
34
35#include <sys/cdefs.h>
36__FBSDID("$FreeBSD: head/sys/netinet/ip_gre.c 274246 2014-11-07 19:13:19Z ae $");
36__FBSDID("$FreeBSD: head/sys/netinet/ip_gre.c 276215 2014-12-25 21:32:37Z ae $");
37
38#include "opt_inet.h"
39#include "opt_inet6.h"
40
41#include <sys/param.h>
42#include <sys/systm.h>
43#include <sys/mbuf.h>
44#include <sys/socket.h>

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

63
64#ifdef INET6
65#include <netinet/ip6.h>
66#endif
67
68#include <net/if_gre.h>
69
70extern struct domain inetdomain;
37
38#include "opt_inet.h"
39#include "opt_inet6.h"
40
41#include <sys/param.h>
42#include <sys/systm.h>
43#include <sys/mbuf.h>
44#include <sys/socket.h>

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

63
64#ifdef INET6
65#include <netinet/ip6.h>
66#endif
67
68#include <net/if_gre.h>
69
70extern struct domain inetdomain;
71extern int gre_input(struct mbuf **, int *, int);
72
73int in_gre_attach(struct gre_softc *);
74int in_gre_output(struct mbuf *, int, int);
75
76static const struct protosw in_gre_protosw = {
77 .pr_type = SOCK_RAW,
78 .pr_domain = &inetdomain,
79 .pr_protocol = IPPROTO_GRE,
80 .pr_flags = PR_ATOMIC|PR_ADDR,
81 .pr_input = gre_input,
82 .pr_output = rip_output,
83 .pr_ctlinput = rip_ctlinput,

--- 89 unchanged lines hidden ---
71static const struct protosw in_gre_protosw = {
72 .pr_type = SOCK_RAW,
73 .pr_domain = &inetdomain,
74 .pr_protocol = IPPROTO_GRE,
75 .pr_flags = PR_ATOMIC|PR_ADDR,
76 .pr_input = gre_input,
77 .pr_output = rip_output,
78 .pr_ctlinput = rip_ctlinput,

--- 89 unchanged lines hidden ---