diff mbox

fix IPv6 queries for bridge multicast snooping

Message ID 1292352136.4720.11.camel@IBM-1B506CFC885
State Accepted, archived
Delegated to: David Miller
Headers show

Commit Message

David Stevens Dec. 14, 2010, 6:42 p.m. UTC
This patch fixes a missing ntohs() for bridge IPv6 multicast snooping.

Signed-off-by: David L Stevens <dlstevens@us.ibm.com>




--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Comments

Herbert Xu Dec. 15, 2010, 1 a.m. UTC | #1
On Tue, Dec 14, 2010 at 10:42:16AM -0800, David L Stevens wrote:
> This patch fixes a missing ntohs() for bridge IPv6 multicast snooping.
> 
> Signed-off-by: David L Stevens <dlstevens@us.ibm.com>

Acked-by: Herbert Xu <herbert@gondor.apana.org.au>

I had wanted to fix this but forgot :)

Thanks,
David Miller Dec. 16, 2010, 10:17 p.m. UTC | #2
From: Herbert Xu <herbert@gondor.apana.org.au>
Date: Wed, 15 Dec 2010 09:00:50 +0800

> On Tue, Dec 14, 2010 at 10:42:16AM -0800, David L Stevens wrote:
>> This patch fixes a missing ntohs() for bridge IPv6 multicast snooping.
>> 
>> Signed-off-by: David L Stevens <dlstevens@us.ibm.com>
> 
> Acked-by: Herbert Xu <herbert@gondor.apana.org.au>
> 
> I had wanted to fix this but forgot :)

Applied and queued up for -stable, thanks!
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff mbox

Patch

--- linux-2.6.37-rc5/net/bridge/br_multicast.c	2010-12-06 20:09:04.000000000 -0800
+++ linux-2.6.37-rc5DLS/net/bridge/br_multicast.c	2010-12-13 14:55:34.228196279 -0800
@@ -437,7 +437,7 @@  static struct sk_buff *br_ip6_multicast_
 	ip6h = ipv6_hdr(skb);
 
 	*(__force __be32 *)ip6h = htonl(0x60000000);
-	ip6h->payload_len = 8 + sizeof(*mldq);
+	ip6h->payload_len = htons(8 + sizeof(*mldq));
 	ip6h->nexthdr = IPPROTO_HOPOPTS;
 	ip6h->hop_limit = 1;
 	ipv6_addr_set(&ip6h->saddr, 0, 0, 0, 0);