Index: conf/files
===================================================================
RCS file: /usr/local/FreeBSD/ncvs/src/sys/conf/files,v
retrieving revision 1.190.2.1
diff -c -r1.190.2.1 files
*** files	1999/01/24 05:11:31	1.190.2.1
--- files	1999/06/07 20:20:03
***************
*** 524,529 ****
--- 524,530 ----
  netinet/ip_state.c	optional ipfilter inet
  netinet/mlf_ipl.c	optional ipfilter inet
  netinet/raw_ip.c	optional inet
+ netinet/gre.c		optional gre 
  netinet/tcp_debug.c	optional tcpdebug
  netinet/tcp_input.c	optional inet
  netinet/tcp_output.c	optional inet
Index: conf/options
===================================================================
RCS file: /usr/local/FreeBSD/ncvs/src/sys/conf/options,v
retrieving revision 1.121.2.1
diff -c -r1.121.2.1 options
*** options	1999/02/08 19:05:55	1.121.2.1
--- options	1999/06/07 20:20:42
***************
*** 197,202 ****
--- 197,203 ----
  IPFIREWALL_VERBOSE_LIMIT	opt_ipfw.h
  IPFIREWALL_DEFAULT_TO_ACCEPT	opt_ipfw.h
  IPFIREWALL_FORWARD		opt_ipfw.h
+ GRE			opt_gre.h
  IPX			opt_ipx.h
  IPXIP			opt_ipx.h
  IPTUNNEL		opt_ipx.h
Index: netinet/in_proto.c
===================================================================
RCS file: /usr/local/FreeBSD/ncvs/src/sys/netinet/in_proto.c,v
retrieving revision 1.47
diff -c -r1.47 in_proto.c
*** in_proto.c	1998/08/23 03:07:14	1.47
--- in_proto.c	1999/06/07 20:45:47
***************
*** 36,41 ****
--- 36,42 ----
  
  #include "opt_ipdivert.h"
  #include "opt_ipx.h"
+ #include "opt_gre.h"
  
  #include <sys/param.h>
  #include <sys/kernel.h>
***************
*** 95,105 ****
    &tcp_usrreqs
  },
  { SOCK_RAW,	&inetdomain,	IPPROTO_RAW,	PR_ATOMIC|PR_ADDR,
!   rip_input,	0,		rip_ctlinput,	rip_ctloutput,
    0,
    0,		0,		0,		0,
    &rip_usrreqs
  },
  { SOCK_RAW,	&inetdomain,	IPPROTO_ICMP,	PR_ATOMIC|PR_ADDR,
    icmp_input,	0,		0,		rip_ctloutput,
    0,
--- 96,114 ----
    &tcp_usrreqs
  },
  { SOCK_RAW,	&inetdomain,	IPPROTO_RAW,	PR_ATOMIC|PR_ADDR,
!   rip_input,	0,		rip_ctlinput,   rip_ctloutput,
    0,
    0,		0,		0,		0,
    &rip_usrreqs
  },
+ #ifdef GRE
+ { SOCK_RAW,     &inetdomain,    IPPROTO_GRE,    PR_ATOMIC|PR_ADDR,
+   gre_input,	0,              0,		rip_ctloutput,
+   0,
+   0,            0,              0,              0,
+   &rip_usrreqs
+ },
+ #endif
  { SOCK_RAW,	&inetdomain,	IPPROTO_ICMP,	PR_ATOMIC|PR_ADDR,
    icmp_input,	0,		0,		rip_ctloutput,
    0,
Index: netinet/ip_var.h
===================================================================
RCS file: /usr/local/FreeBSD/ncvs/src/sys/netinet/ip_var.h,v
retrieving revision 1.45
diff -c -r1.45 ip_var.h
*** ip_var.h	1998/08/24 07:47:39	1.45
--- ip_var.h	1999/06/07 20:51:48
***************
*** 167,172 ****
--- 167,173 ----
  void	 rip_init __P((void));
  void	 rip_input __P((struct mbuf *, int));
  int	 rip_output __P((struct mbuf *, struct socket *, u_long));
+ void	gre_input __P((struct mbuf *, int));
  void	ipip_input __P((struct mbuf *, int));
  void	rsvp_input __P((struct mbuf *, int));
  int	ip_rsvp_init __P((struct socket *));