On Friday 2011-11-25 18:36, Pablo Neira Ayuso wrote: >On Fri, Nov 25, 2011 at 10:36:26AM +0100, Hans Schillstrom wrote: >> diff --git a/include/net/ipv6.h b/include/net/ipv6.h >> index 3f0258d..9e4d4f9 100644 >> --- a/include/net/ipv6.h >> +++ b/include/net/ipv6.h >> @@ -39,6 +39,7 @@ >> #define NEXTHDR_ICMP 58 /* ICMP for IPv6. */ >> #define NEXTHDR_NONE 59 /* No next header */ >> #define NEXTHDR_DEST 60 /* Destination options header. */ >> +#define NEXTHDR_SCTP 132 /* Stream Control Transport Protocol */ >> #define NEXTHDR_MOBILITY 135 /* Mobility header. */ >> >> #define NEXTHDR_MAX 255 > >This has to go in a separated patch. Please, send it to netdev. I >think davem can pick that for 3.2-rc I do have to wonder a little why we need the l4proto values twice (IPPROTO_SCTP plus NEXTHDR_SCTP). Has nobody ever thought of doing one foobar_<PROTOCOL>? >> + icmph->type != ICMP_REDIRECT) >> + return nhoff; >> + /* Checkin full IP header plus 8 bytes of protocol to >> + * avoid additional coding at protocol handlers. >> + */ >> + if (!pskb_may_pull(skb, nhoff + iphsz + sizeof(_ih) + 8)) >> + return nhoff; NB:I point out that the preferred long comment style begins with /*\n (to match the trailing \n*/, naturally) like in >> +/* >> + * ICMPv6 >> + * Input nhoff Offset into network header >> + * offset where ICMPv6 header starts >> + * Returns true if it's a icmp error and updates nhoff >> + */ -- To unsubscribe from this list: send the line "unsubscribe netfilter-devel" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
