Attached diff fixes compile errors without INET6 on pipex.c
pointed out by Julien Crapovich on misc@
I've tested the diff does not create any binary change on GENERIC (w/o
DIAGNOSTICS)
ok?
Index: net/pipex.c
===================================================================
RCS file: /cvs/src/sys/net/pipex.c,v
retrieving revision 1.22
diff -u -p -r1.22 pipex.c
--- net/pipex.c 15 Oct 2011 03:24:11 -0000 1.22
+++ net/pipex.c 25 Nov 2011 01:33:27 -0000
@@ -1258,6 +1258,7 @@ drop:
return;
}
+#endif
Static struct mbuf *
pipex_common_input(struct pipex_session *session, struct mbuf *m0, int hlen,
@@ -1387,7 +1388,6 @@ pipex_pppoe_lookup_session(struct mbuf *
return (session);
}
-#endif
struct mbuf *
pipex_pppoe_input(struct mbuf *m0, struct pipex_session *session)
@@ -1905,8 +1905,12 @@ pipex_l2tp_output(struct mbuf *m0, struc
((pipex_session_is_l2tp_data_sequencing_on(session))
? sizeof(struct pipex_l2tp_seq_header) : 0) +
sizeof(struct udphdr) +
+#ifdef INET6
((session->peer.sin6.sin6_family == AF_INET6)
? sizeof(struct ip6_hdr) : sizeof(struct ip));
+#else
+ sizeof(struct ip);
+#endif
datalen = 0;
if (m0 != NULL) {
@@ -1922,8 +1926,12 @@ pipex_l2tp_output(struct mbuf *m0, struc
m0->m_pkthdr.len = m0->m_len = hlen;
}
+#ifdef INET6
hlen = (session->peer.sin6.sin6_family == AF_INET6)
? sizeof(struct ip6_hdr) : sizeof(struct ip);
+#else
+ hlen = sizeof(struct ip);
+#endif
plen = datalen + sizeof(struct pipex_l2tp_header) +
((pipex_session_is_l2tp_data_sequencing_on(session))
? sizeof(struct pipex_l2tp_seq_header) : 0);
Index: net/pipex_local.h
===================================================================
RCS file: /cvs/src/sys/net/pipex_local.h,v
retrieving revision 1.13
diff -u -p -r1.13 pipex_local.h
--- net/pipex_local.h 15 Oct 2011 03:24:11 -0000 1.13
+++ net/pipex_local.h 25 Nov 2011 01:33:27 -0000
@@ -390,7 +390,9 @@ Static void pipex_ppp_o
Static inline int pipex_ppp_proto (struct mbuf *, struct
pipex_session *, int, int *);
Static void pipex_ppp_input (struct mbuf *, struct
pipex_session *, int);
Static void pipex_ip_input (struct mbuf *, struct
pipex_session *);
+#ifdef INET6
Static void pipex_ip6_input (struct mbuf *, struct
pipex_session *);
+#endif
Static struct mbuf *pipex_common_input(struct pipex_session *,
struct mbuf *, int, int);
#ifdef PIPEX_PPPOE
