| Submitter | Ang Way Chuang |
|---|---|
| Date | Dec. 14, 2012, 9:08 a.m. |
| Message ID | <50CAEC97.2090609@sfc.wide.ad.jp> |
| Download | mbox | patch |
| Permalink | /patch/206373/ |
| State | Accepted |
| Delegated to: | David Miller |
| Headers | show |
Comments
On Fri, 14 Dec 2012 17:08:39 +0800 Ang Way Chuang <wcang@sfc.wide.ad.jp> wrote: > As suggested by Stephen Hemminger, this remove the temporary variable introduced in commit > eca2a43bb0d2c6ebd528be6acb30a88435abe307 > > Signed-off-by: Ang Way Chuang <wcang@sfc.wide.ad.jp> Acked-by: Stephen Hemminger <shemminger@vyatta.com> -- 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
From: Ang Way Chuang <wcang@sfc.wide.ad.jp> Date: Fri, 14 Dec 2012 17:08:39 +0800 > As suggested by Stephen Hemminger, this remove the temporary > variable introduced in commit > eca2a43bb0d2c6ebd528be6acb30a88435abe307 > > Signed-off-by: Ang Way Chuang <wcang@sfc.wide.ad.jp> Applied. In the future, please provide the commit message header line when referencing commits by ID, this allows to avoid ambiguity when a commit exists in multiple trees. I added it this time for you. Thanks. -- 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
Patch
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)
As suggested by Stephen Hemminger, this remove the temporary variable introduced in commit eca2a43bb0d2c6ebd528be6acb30a88435abe307 Signed-off-by: Ang Way Chuang <wcang@sfc.wide.ad.jp> --- -- 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