[Bridge] [PATCH] bridge: Bug fix for incorrect interpretation of MLDv2 maximum response code

Stephen Hemminger shemminger at vyatta.com
Fri Dec 14 00:23:46 UTC 2012


On Fri, 14 Dec 2012 08:19:04 +0800
Ang Way Chuang <wcang at sfc.wide.ad.jp> wrote:

> On 14/12/2012 08:12, Stephen Hemminger wrote:
> > On Fri, 14 Dec 2012 08:07:01 +0800
> > Ang Way Chuang <wcang at sfc.wide.ad.jp> wrote:
> >
> >> This patch fixes the incorrect interpretation of endianness of MLDv2 maximum response
> >> code within bridge's multicast snooping code.
> >>
> >> Signed-off-by: Ang Way Chuang <wcang at sfc.wide.ad.jp>
> >> ---
> >> diff --git a/net/bridge/br_multicast.c b/net/bridge/br_multicast.c
> >> index 977c3ee..29c6283 100644
> >> --- a/net/bridge/br_multicast.c
> >> +++ b/net/bridge/br_multicast.c
> >> @@ -1172,7 +1172,7 @@ static int br_ip6_multicast_query(struct net_bridge *br,
> >>  		mld2q = (struct mld2_query *)icmp6_hdr(skb);
> >>  		if (!mld2q->mld2q_nsrcs)
> >>  			group = &mld2q->mld2q_mca;
> >> -		max_delay = mld2q->mld2q_mrc ? MLDV2_MRC(mld2q->mld2q_mrc) : 1;
> >> +		max_delay = mld2q->mld2q_mrc ? MLDV2_MRC(ntohs(mld2q->mld2q_mrc)) : 1;
> >>  	}
> >>  
> >>  	if (!group)
> > Already fixed as part of my patch to fix sparse warnings.
> > --
> > To unsubscribe from this list: send the line "unsubscribe netdev" in
> > the body of a message to majordomo at vger.kernel.org
> > More majordomo info at  http://vger.kernel.org/majordomo-info.html
> >
> aye, aye.

Yours looks cleaner (I added a temp variable). You might want to submit
patch to switch to your oneline version.


More information about the Bridge mailing list