From patchwork Mon Apr 21 18:59:35 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Linus_L=C3=BCssing?= X-Patchwork-Id: 340821 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 D119014017D for ; Tue, 22 Apr 2014 11:04:07 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754301AbaDUS7t (ORCPT ); Mon, 21 Apr 2014 14:59:49 -0400 Received: from mout.web.de ([212.227.17.11]:58131 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753328AbaDUS7r (ORCPT ); Mon, 21 Apr 2014 14:59:47 -0400 Received: from localhost ([85.17.31.120]) by smtp.web.de (mrweb102) with ESMTPSA (Nemesis) id 0MPYNR-1WXekL1aAT-004jfn; Mon, 21 Apr 2014 20:59:44 +0200 From: =?UTF-8?q?Linus=20L=C3=BCssing?= To: netdev@vger.kernel.org Cc: bridge@lists.linux-foundation.org, Stephen Hemminger , "David S. Miller" , linux-kernel@vger.kernel.org, Hannes Frederic Sowa , =?UTF-8?q?Linus=20L=C3=BCssing?= Subject: [PATCH] bridge: simplify a br_multicast_query_received() function call Date: Mon, 21 Apr 2014 20:59:35 +0200 Message-Id: <1398106775-14857-1-git-send-email-linus.luessing@web.de> X-Mailer: git-send-email 1.9.2 MIME-Version: 1.0 X-Provags-ID: V03:K0:zBLrb2aRRtCbgthWWTdgUiPSDehZmzeDFkLHbjQyK6zeVEQ7bwh kZ1ZQTYLUVd6Ck3/U1IK/6WH44ASZ6eOd96/71X2aM8RoxEftT7T4HKcDdPTHw2L96I9+ZL 96dpcD+ks06dUde0kHoOEqVkN+yedcuY9uK4qetJphkRI1vq73xvn2TzMfiUuRObMxvokXN Nvm+oIC+/p6RYQ523qSng== Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org 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)