Deleted Added
full compact
ip6_gre.c (274246) ip6_gre.c (276215)
1/*-
2 * Copyright (c) 2014 Andrey V. Elsukov <ae@FreeBSD.org>
3 * All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions
7 * are met:
8 *

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

20 * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
21 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
22 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
23 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
24 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
25 */
26
27#include <sys/cdefs.h>
1/*-
2 * Copyright (c) 2014 Andrey V. Elsukov <ae@FreeBSD.org>
3 * All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions
7 * are met:
8 *

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

20 * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
21 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
22 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
23 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
24 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
25 */
26
27#include <sys/cdefs.h>
28__FBSDID("$FreeBSD: head/sys/netinet6/ip6_gre.c 274246 2014-11-07 19:13:19Z ae $");
28__FBSDID("$FreeBSD: head/sys/netinet6/ip6_gre.c 276215 2014-12-25 21:32:37Z ae $");
29
30#include "opt_inet.h"
31#include "opt_inet6.h"
32
33#include <sys/param.h>
34#include <sys/lock.h>
35#include <sys/rmlock.h>
36#include <sys/systm.h>

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

57#endif
58#include <netinet/ip_encap.h>
59#include <netinet/ip6.h>
60#include <netinet6/ip6_var.h>
61#include <netinet6/in6_var.h>
62#include <net/if_gre.h>
63
64extern struct domain inet6domain;
29
30#include "opt_inet.h"
31#include "opt_inet6.h"
32
33#include <sys/param.h>
34#include <sys/lock.h>
35#include <sys/rmlock.h>
36#include <sys/systm.h>

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

57#endif
58#include <netinet/ip_encap.h>
59#include <netinet/ip6.h>
60#include <netinet6/ip6_var.h>
61#include <netinet6/in6_var.h>
62#include <net/if_gre.h>
63
64extern struct domain inet6domain;
65extern int gre_input(struct mbuf **, int *, int);
66
67int in6_gre_attach(struct gre_softc *);
68int in6_gre_output(struct mbuf *, int, int);
69
70struct protosw in6_gre_protosw = {
71 .pr_type = SOCK_RAW,
72 .pr_domain = &inet6domain,
73 .pr_protocol = IPPROTO_GRE,
74 .pr_flags = PR_ATOMIC|PR_ADDR,
75 .pr_input = gre_input,
76 .pr_output = rip6_output,
77 .pr_ctloutput = rip6_ctloutput,

--- 74 unchanged lines hidden ---
65struct protosw in6_gre_protosw = {
66 .pr_type = SOCK_RAW,
67 .pr_domain = &inet6domain,
68 .pr_protocol = IPPROTO_GRE,
69 .pr_flags = PR_ATOMIC|PR_ADDR,
70 .pr_input = gre_input,
71 .pr_output = rip6_output,
72 .pr_ctloutput = rip6_ctloutput,

--- 74 unchanged lines hidden ---