Skip to content

Commit

Permalink
bridge: remove temporary variable for MLDv2 maximum response code com…
Browse files Browse the repository at this point in the history
…putation

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

Signed-off-by: Ang Way Chuang <wcang@sfc.wide.ad.jp>
Acked-by: Stephen Hemminger <shemminger@vyatta.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Ang Way Chuang authored and David S. Miller committed Dec 14, 2012
1 parent 17bc14b commit 8fa45a7
Showing 1 changed file with 1 addition and 3 deletions.
4 changes: 1 addition & 3 deletions net/bridge/br_multicast.c
Original file line number Diff line number Diff line change
Expand Up @@ -1165,16 +1165,14 @@ static int br_ip6_multicast_query(struct net_bridge *br,
if (max_delay)
group = &mld->mld_mca;
} else if (skb->len >= sizeof(*mld2q)) {
u16 mrc;
if (!pskb_may_pull(skb, sizeof(*mld2q))) {
err = -EINVAL;
goto out;
}
mld2q = (struct mld2_query *)icmp6_hdr(skb);
if (!mld2q->mld2q_nsrcs)
group = &mld2q->mld2q_mca;
mrc = ntohs(mld2q->mld2q_mrc);
max_delay = mrc ? MLDV2_MRC(mrc) : 1;
max_delay = mld2q->mld2q_mrc ? MLDV2_MRC(ntohs(mld2q->mld2q_mrc)) : 1;
}

if (!group)
Expand Down

0 comments on commit 8fa45a7

Please sign in to comment.