diff options
| author | David S. Miller <davem@davemloft.net> | 2010-12-17 15:27:22 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-12-17 15:27:22 -0500 |
| commit | b4aa9e05a61b845541fa6f5b1d246976922601f0 (patch) | |
| tree | ca94478c3df281ab76a3399f5ba6341ade3f5791 /net/bridge/br_multicast.c | |
| parent | 1dc0f3c54ce1df957f99c17b145488fd03eb1a59 (diff) | |
| parent | 4b8fe66300acb2fba8b16d62606e0d30204022fc (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/bnx2x/bnx2x.h
drivers/net/wireless/iwlwifi/iwl-1000.c
drivers/net/wireless/iwlwifi/iwl-6000.c
drivers/net/wireless/iwlwifi/iwl-core.h
drivers/vhost/vhost.c
Diffstat (limited to 'net/bridge/br_multicast.c')
| -rw-r--r-- | net/bridge/br_multicast.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/bridge/br_multicast.c b/net/bridge/br_multicast.c index 85a0398b221..f03e2e98cd4 100644 --- a/net/bridge/br_multicast.c +++ b/net/bridge/br_multicast.c | |||
| @@ -445,7 +445,7 @@ static struct sk_buff *br_ip6_multicast_alloc_query(struct net_bridge *br, | |||
| 445 | ip6h = ipv6_hdr(skb); | 445 | ip6h = ipv6_hdr(skb); |
| 446 | 446 | ||
| 447 | *(__force __be32 *)ip6h = htonl(0x60000000); | 447 | *(__force __be32 *)ip6h = htonl(0x60000000); |
| 448 | ip6h->payload_len = 8 + sizeof(*mldq); | 448 | ip6h->payload_len = htons(8 + sizeof(*mldq)); |
| 449 | ip6h->nexthdr = IPPROTO_HOPOPTS; | 449 | ip6h->nexthdr = IPPROTO_HOPOPTS; |
| 450 | ip6h->hop_limit = 1; | 450 | ip6h->hop_limit = 1; |
| 451 | ipv6_addr_set(&ip6h->saddr, 0, 0, 0, 0); | 451 | ipv6_addr_set(&ip6h->saddr, 0, 0, 0, 0); |