From patchwork Wed Jun 11 23:41:24 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: 358934 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 36A671400F0 for ; Thu, 12 Jun 2014 09:41:03 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754516AbaFKXkp (ORCPT ); Wed, 11 Jun 2014 19:40:45 -0400 Received: from mout.web.de ([212.227.17.12]:57148 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754411AbaFKXkn (ORCPT ); Wed, 11 Jun 2014 19:40:43 -0400 Received: from localhost ([109.201.143.233]) by smtp.web.de (mrweb001) with ESMTPSA (Nemesis) id 0Mb8h9-1XB1PG3cJn-00KjDv; Thu, 12 Jun 2014 01:40:34 +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, =?UTF-8?q?Linus=20L=C3=BCssing?= Subject: [PATCH 2/2] bridge: fix compile error when compiling without IPv6 support Date: Thu, 12 Jun 2014 01:41:24 +0200 Message-Id: <1402530084-15061-3-git-send-email-linus.luessing@web.de> X-Mailer: git-send-email 2.0.0 In-Reply-To: <1402530084-15061-1-git-send-email-linus.luessing@web.de> References: <1402530084-15061-1-git-send-email-linus.luessing@web.de> MIME-Version: 1.0 X-Provags-ID: V03:K0:H6Gm+4ME62OiOnbj4Cnfnzf0BusTXdrxsYHSIlXbCYk1RR3qj4G /Ngo54tU6mJp1Y4ornSe4Qo0TjYvyOuQ7loIn0FDjyOdFMUZDRJQuJtZChgTHa7IMqSu6dB fwtfz9/Z6PuntWKb2qdbmWnsfio3tGMlRjapIYlFEFH5Qq/4RFStq/OL6e1n2fwLZmRfcJy rHh9JnxSO7oWf7f/8OA5A== Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Some fields in "struct net_bridge" aren't available when compiling the kernel without IPv6 support. Therefore adding a check/macro to skip the complaining code sections in that case. Introduced by 2cd4143192e8c60f66cb32c3a30c76d0470a372d ("bridge: memorize and export selected IGMP/MLD querier port") Reported-by: kbuild test robot Signed-off-by: Linus Lüssing --- net/bridge/br_multicast.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/net/bridge/br_multicast.c b/net/bridge/br_multicast.c index 876e5fb..abfa0b65 100644 --- a/net/bridge/br_multicast.c +++ b/net/bridge/br_multicast.c @@ -2246,11 +2246,13 @@ bool br_multicast_has_querier_adjacent(struct net_device *dev, int proto) rcu_dereference(br->ip4_querier.port) == port) goto unlock; break; +#if IS_ENABLED(CONFIG_IPV6) case ETH_P_IPV6: if (!timer_pending(&br->ip6_other_query.timer) || rcu_dereference(br->ip6_querier.port) == port) goto unlock; break; +#endif default: goto unlock; }