* [PATCH] bridge: remove temporary variable for MLDv2 maximum response code computation
@ 2012-12-14 9:08 Ang Way Chuang
2012-12-14 16:19 ` Stephen Hemminger
2012-12-14 18:15 ` David Miller
0 siblings, 2 replies; 3+ messages in thread
From: Ang Way Chuang @ 2012-12-14 9:08 UTC (permalink / raw)
To: netdev, Stephen Hemminger
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>
---
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)
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] bridge: remove temporary variable for MLDv2 maximum response code computation
2012-12-14 9:08 [PATCH] bridge: remove temporary variable for MLDv2 maximum response code computation Ang Way Chuang
@ 2012-12-14 16:19 ` Stephen Hemminger
2012-12-14 18:15 ` David Miller
1 sibling, 0 replies; 3+ messages in thread
From: Stephen Hemminger @ 2012-12-14 16:19 UTC (permalink / raw)
To: Ang Way Chuang; +Cc: netdev
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>
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] bridge: remove temporary variable for MLDv2 maximum response code computation
2012-12-14 9:08 [PATCH] bridge: remove temporary variable for MLDv2 maximum response code computation Ang Way Chuang
2012-12-14 16:19 ` Stephen Hemminger
@ 2012-12-14 18:15 ` David Miller
1 sibling, 0 replies; 3+ messages in thread
From: David Miller @ 2012-12-14 18:15 UTC (permalink / raw)
To: wcang; +Cc: netdev, shemminger
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.
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2012-12-14 18:15 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2012-12-14 9:08 [PATCH] bridge: remove temporary variable for MLDv2 maximum response code computation Ang Way Chuang
2012-12-14 16:19 ` Stephen Hemminger
2012-12-14 18:15 ` David Miller
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.