summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAng Way Chuang <wcang@sfc.wide.ad.jp>2012-12-13 23:08:39 +0000
committerDavid S. Miller <davem@davemloft.net>2012-12-14 13:14:06 -0500
commit8fa45a70badf6ce2c57421c17e86e8967ce0d478 (patch)
tree641681458648b40fef28eddd97c24956ebfea970
parent17bc14b767cf0692420c43dbe5310ae98a5a7836 (diff)
downloadop-kernel-dev-8fa45a70badf6ce2c57421c17e86e8967ce0d478.zip
op-kernel-dev-8fa45a70badf6ce2c57421c17e86e8967ce0d478.tar.gz
bridge: remove temporary variable for MLDv2 maximum response code computation
As suggested by Stephen Hemminger, this remove the temporary variable introduced in commit eca2a43bb0d2c6ebd528be6acb30a88435abe307 ("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>
-rw-r--r--net/bridge/br_multicast.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/net/bridge/br_multicast.c b/net/bridge/br_multicast.c
index 1093c89..2561af9 100644
--- a/net/bridge/br_multicast.c
+++ b/net/bridge/br_multicast.c
@@ -1165,7 +1165,6 @@ 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;
@@ -1173,8 +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;
- 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)
OpenPOWER on IntegriCloud