[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-Id: <1398106775-14857-1-git-send-email-linus.luessing@web.de>
Date: Mon, 21 Apr 2014 20:59:35 +0200
From: Linus Lüssing <linus.luessing@....de>
To: netdev@...r.kernel.org
Cc: bridge@...ts.linux-foundation.org,
Stephen Hemminger <stephen@...workplumber.org>,
"David S. Miller" <davem@...emloft.net>,
linux-kernel@...r.kernel.org,
Hannes Frederic Sowa <hannes@...essinduktion.org>,
Linus Lüssing <linus.luessing@....de>
Subject: [PATCH] bridge: simplify a br_multicast_query_received() function call
The call from the IPv6 part can be simplified as the beginning of the
calling function ensures that we end up here when having a proper IPv6
source address only.
Introduced by 6565b9eeef194afbb3beec80d6dd2447f4091f8c
("bridge: multicast: add sanity check for query source addresses")
Reported-by: Hannes Frederic Sowa <hannes@...essinduktion.org>
Signed-off-by: Linus Lüssing <linus.luessing@....de>
---
net/bridge/br_multicast.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/net/bridge/br_multicast.c b/net/bridge/br_multicast.c
index 7b757b5..d2c3aae 100644
--- a/net/bridge/br_multicast.c
+++ b/net/bridge/br_multicast.c
@@ -1282,8 +1282,7 @@ static int br_ip6_multicast_query(struct net_bridge *br,
goto out;
}
- br_multicast_query_received(br, port, &br->ip6_querier,
- !ipv6_addr_any(&ip6h->saddr),
+ br_multicast_query_received(br, port, &br->ip6_querier, 1,
is_general_query, max_delay);
if (!group)
--
1.7.10.4
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Powered by blists - more mailing lists