WITHOUT_INET6 broken on CURRENT

[Bjoern A. Zeeb]

On Sun, 8 Feb 2009, Michael Proto wrote:

> On Sun, Feb 8, 2009 at 7:59 PM, Garrett Cooper <yanefbsd at gmail.com> wrote:
>> Hi Randall,
>>    I recently rebuilt my sources today and I noticed that it's now
>> breaking on a valid warning with sctp:
>>
...
>> /usr/src/sys/netinet/sctputil.c
>> cc1: warnings being treated as errors
>> In file included from /usr/src/sys/netinet/sctputil.c:6553:
>> /usr/src/sys/netinet6/sctp6_var.h:57: warning: 'struct icmp6_hdr'
>> declared inside parameter list
>> /usr/src/sys/netinet6/sctp6_var.h:57: warning: its scope is only this
>> definition or declaration, which is probably not what you want
>> *** Error code 1
...
>>    I'm going to rebuild setting WITHOUT_SCTP for now, but this needs
>> to be fixed.
>
> IIRC SCTP has always required INET6 to compile since it was first
> introduced. I thought it was a prerequisite.

No, we've always fixed it.

I have sent this patch to Randall last weekend:

Index: sys/netinet/sctputil.c
===================================================================
--- sys/netinet/sctputil.c      (revision 188293)
+++ sys/netinet/sctputil.c      (working copy)
@@ -6550,7 +6550,6 @@
  #include <netinet/udp.h>
  #include <netinet/udp_var.h>
  #include <sys/proc.h>
-#include <netinet6/sctp6_var.h>

  static void
  sctp_recv_udp_tunneled_packet(struct mbuf *m, int off, struct inpcb *ignored)

-- 
Bjoern A. Zeeb                      The greatest risk is not taking one.