From patchwork Fri Dec 14 09:08:39 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ang Way Chuang X-Patchwork-Id: 206373 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 0454C2C008F for ; Fri, 14 Dec 2012 20:08:50 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753579Ab2LNJIq (ORCPT ); Fri, 14 Dec 2012 04:08:46 -0500 Received: from shonan.sfc.wide.ad.jp ([203.178.142.130]:44011 "EHLO mail.sfc.wide.ad.jp" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751652Ab2LNJIo (ORCPT ); Fri, 14 Dec 2012 04:08:44 -0500 Received: from [192.168.0.104] (unknown [118.101.238.21]) by mail.sfc.wide.ad.jp (Postfix) with ESMTPSA id AF96427815C; Fri, 14 Dec 2012 18:08:41 +0900 (JST) Message-ID: <50CAEC97.2090609@sfc.wide.ad.jp> Date: Fri, 14 Dec 2012 17:08:39 +0800 From: Ang Way Chuang User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:15.0) Gecko/20120911 Thunderbird/15.0.1 MIME-Version: 1.0 To: netdev@vger.kernel.org, Stephen Hemminger Subject: [PATCH] bridge: remove temporary variable for MLDv2 maximum response code computation Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org As suggested by Stephen Hemminger, this remove the temporary variable introduced in commit eca2a43bb0d2c6ebd528be6acb30a88435abe307 Signed-off-by: Ang Way Chuang Acked-by: Stephen Hemminger --- -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html 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)