d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

After r274246 make the tree compile again.

Browse Source 
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.
This commit is contained in:
Bjoern A. Zeeb 2014-11-08 14:41:32 +00:00
parent 13235011d5
commit 4dbd7c5dc4
2 changed files with 17 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
sys/modules/if_gre/Makefile
View File

@ -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

3
sys/net/if_gre.c
View File

@ -632,6 +632,7 @@ gre_set_tunnel(struct ifnet *ifp, struct sockaddr *src,
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 mbuf *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);