Author: bz
Date: Sat Nov 8 14:41:32 2014
New Revision: 274289
URL: https://svnweb.freebsd.org/changeset/base/274289
Log:
After r274246 make the tree compile again.
gcc requires variables to be initialised in two places. One of them
is correctly used only under the same conditional though.
For module builds properly check if the kernel supports INET or INET6,
as otherwise various mips kernels without IPv6 support would fail to build.
Modified:
head/sys/modules/if_gre/Makefile
head/sys/net/if_gre.c
Modified: head/sys/modules/if_gre/Makefile
==============================================================================
--- head/sys/modules/if_gre/Makefile Sat Nov 8 13:49:59 2014
(r274288)
+++ head/sys/modules/if_gre/Makefile Sat Nov 8 14:41:32 2014
(r274289)
@@ -6,10 +6,24 @@
KMOD= if_gre
SRCS= if_gre.c opt_inet.h opt_inet6.h
+.if defined(KERNBUILDDIR)
+OPT_INET!= cat ${KERNBUILDDIR}/opt_inet.h; echo
+.if empty(OPT_INET)
+MK_INET_SUPPORT=no
+.endif
+.endif
+
.if ${MK_INET_SUPPORT} != "no"
SRCS+= ip_gre.c
.endif
+.if defined(KERNBUILDDIR)
+OPT_INET6!= cat ${KERNBUILDDIR}/opt_inet6.h; echo
+.if empty(OPT_INET6)
+MK_INET6_SUPPORT=no
+.endif
+.endif
+
.if ${MK_INET6_SUPPORT} != "no"
SRCS+= ip6_gre.c
.endif
Modified: head/sys/net/if_gre.c
==============================================================================
--- head/sys/net/if_gre.c Sat Nov 8 13:49:59 2014 (r274288)
+++ head/sys/net/if_gre.c Sat Nov 8 14:41:32 2014 (r274289)
@@ -632,6 +632,7 @@ gre_set_tunnel(struct ifnet *ifp, struct
gre_updatehdr(sc);
GRE_WUNLOCK(sc);
+ error = 0;
switch (src->sa_family) {
#ifdef INET
case AF_INET:
@@ -865,6 +866,8 @@ gre_transmit(struct ifnet *ifp, struct m
want_seq = (sc->gre_options & GRE_ENABLE_SEQ) != 0;
if (want_seq)
oseq = sc->gre_oseq++; /* XXX */
+ else
+ oseq = 0; /* Make compiler happy. */
want_csum = (sc->gre_options & GRE_ENABLE_CSUM) != 0;
M_SETFIB(m, sc->gre_fibnum);
M_PREPEND(m, hlen, M_NOWAIT);
_______________________________________________
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
