From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: From: =?UTF-8?q?Linus=20L=C3=BCssing?= Date: Mon, 21 Apr 2014 20:59:35 +0200 Message-Id: <1398106775-14857-1-git-send-email-linus.luessing@web.de> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 8bit Subject: [Bridge] [PATCH] bridge: simplify a br_multicast_query_received() function call List-Id: Linux Ethernet Bridging List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: netdev@vger.kernel.org Cc: bridge@lists.linux-foundation.org, linux-kernel@vger.kernel.org, Stephen Hemminger , =?UTF-8?q?Linus=20L=C3=BCssing?= , "David S. Miller" 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 Signed-off-by: Linus Lüssing --- 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