]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
bridge: fix IPv6 queries for bridge multicast snooping
authorDavid Stevens <dlstevens@us.ibm.com>
Tue, 14 Dec 2010 08:42:16 +0000 (08:42 +0000)
committerAK <andi@firstfloor.org>
Sun, 6 Feb 2011 19:03:37 +0000 (11:03 -0800)
[ Upstream commit 76d661586c8131453ba75a2e027c1f21511a893a]

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>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: Andi Kleen <ak@linux.intel.com>
net/bridge/br_multicast.c

index 27ae946363f16c6b709b5f4267e7ab5a574d5314..5a9bcfe981c8283dd37bb81959286e01a8164acb 100644 (file)
@@ -437,7 +437,7 @@ static struct sk_buff *br_ip6_multicast_alloc_query(struct net_bridge *br,
        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);