Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8fa45a70 authored by Ang Way Chuang's avatar Ang Way Chuang Committed by David S. Miller
Browse files

bridge: remove temporary variable for MLDv2 maximum response code computation 



As suggested by Stephen Hemminger, this remove the temporary variable
introduced in commit eca2a43b
("bridge: fix icmpv6 endian bug and other sparse warnings")

Signed-off-by: default avatarAng Way Chuang <wcang@sfc.wide.ad.jp>
Acked-by: default avatarStephen Hemminger <shemminger@vyatta.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 17bc14b7

net/bridge/br_multicast.c

+1 −3
Original line number Original line Diff line number Diff line
@@ -1165,7 +1165,6 @@ static int br_ip6_multicast_query(struct net_bridge *br, 
		if (max_delay)

		if (max_delay)

			group = &mld->mld_mca;

			group = &mld->mld_mca;

	} else if (skb->len >= sizeof(*mld2q)) {

	} else if (skb->len >= sizeof(*mld2q)) {

		u16 mrc;

		if (!pskb_may_pull(skb, sizeof(*mld2q))) {

		if (!pskb_may_pull(skb, sizeof(*mld2q))) {

			err = -EINVAL;

			err = -EINVAL;

			goto out;

			goto out;
@@ -1173,8 +1172,7 @@ static int br_ip6_multicast_query(struct net_bridge *br, 
		mld2q = (struct mld2_query *)icmp6_hdr(skb);

		mld2q = (struct mld2_query *)icmp6_hdr(skb);

		if (!mld2q->mld2q_nsrcs)

		if (!mld2q->mld2q_nsrcs)

			group = &mld2q->mld2q_mca;

			group = &mld2q->mld2q_mca;

		mrc = ntohs(mld2q->mld2q_mrc);

		max_delay = mld2q->mld2q_mrc ? MLDV2_MRC(ntohs(mld2q->mld2q_mrc)) : 1;

		max_delay = mrc ? MLDV2_MRC(mrc) : 1;

	}

	}





	if (!group)

	if (!group)