From a53f5f24758610300fea1f7abab9ae10f83b14d5 Mon Sep 17 00:00:00 2001 From: Eric Dumazet Date: Tue, 20 Apr 2010 03:20:05 +0000 Subject: [PATCH] --- yaml --- r: 190226 b: refs/heads/master c: 8eabf95cb17253a3ac72b1a62ce8a80b3efecd62 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/net/bridge/br_multicast.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index d40b5298cdcb..6023fdf67c18 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e46754f8c9333170f11780d8e3a70da1b1a88338 +refs/heads/master: 8eabf95cb17253a3ac72b1a62ce8a80b3efecd62 diff --git a/trunk/net/bridge/br_multicast.c b/trunk/net/bridge/br_multicast.c index f29ada827a6a..386c15369d91 100644 --- a/trunk/net/bridge/br_multicast.c +++ b/trunk/net/bridge/br_multicast.c @@ -727,7 +727,7 @@ static int br_multicast_igmp3_report(struct net_bridge *br, group = grec->grec_mca; type = grec->grec_type; - len += grec->grec_nsrcs * 4; + len += ntohs(grec->grec_nsrcs) * 4; if (!pskb_may_pull(skb, len)) return -EINVAL;