From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752506AbdAYWaO (ORCPT ); Wed, 25 Jan 2017 17:30:14 -0500 Received: from mout.kundenserver.de ([212.227.126.135]:51076 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752118AbdAYWaM (ORCPT ); Wed, 25 Jan 2017 17:30:12 -0500 From: Arnd Bergmann To: Stephen Hemminger , "David S. Miller" Cc: =?UTF-8?q?Linus=20L=C3=BCssing?= , Arnd Bergmann , Nikolay Aleksandrov , Felix Fietkau , bridge@lists.linux-foundation.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] [net-next] bridge: move maybe_deliver_addr() inside #ifdef Date: Wed, 25 Jan 2017 23:29:33 +0100 Message-Id: <20170125222950.1352566-1-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 X-Provags-ID: V03:K0:kklwJvneI8QQByQPMegmU9GSvuEDS7EjCYH8E5666/5ztsWqTni Nhuj6T44agigtoEjGRJRiV9nF+mp2p9mEOy6pDpjlFPviEyhADp13nT5a24DUn4lYTBTC1T ypikDx1RZR54V8u9Z9pEgjIkgGXM/7t3ILHf1ZnMDSSfUiBDEshl6gTSt8RlkjdOa6Qklxu eduAIIddwN8zGTtFVb4sQ== X-UI-Out-Filterresults: notjunk:1;V01:K0:ghHBOhcjWmI=:kWpi5tlWt3Dn6ofgpd6hdI pEXi/gGripl1jndOI7R7+UebC3Ge8vPcq98J2O1PJkbGe4uM9gCj5drxTUgKaAiZv+vtd0DbN 4ZEm+HXhOsdXW0bczR8lOgSiVEiNp0axqDRw2YfWltz3f3rSTuTL9Oi94KqtX+y1fxqUdnzvi WEnA47o8105aA5du2IyPBgBQaMWLSshdCfLZVN8+pTF9x4nEAZwoVi4gipTFNipKJ4gpY4mMi /C71yD8w/+hE6VtXmjJyOtA/JyLGxhMhfSkvKUhJi99zCJpcJrR0WlPhsiMcYMqTns5CEHiCy ggiXdYZKR58lzryHOlbnZ78fM+W40OmX501+6Aglm8thOR+O683YDy1IEewnsnvXU+m/BJmSm 9r3A7InSZ+eWJfohMClH9WZae7HtpfhVsYQOTy3OP6fnzYdEQsREGP/l4A2U2M1UDvLmFsBzJ Smer3nd2X1Un8+vYjDvuEgviROmB/G1RuQzGOl3SrfsV7k7XFb3q/u8lo22uc0I9PNUXSgRv3 zPJsf+NKcWk7cXgxM9SEj+s06iYgmJF7WUnOWx3DiCFYUi+FeVYMUt4wFT/LSPTWm9gx0BxYl Edh6psbenBC4NbuaqeMlbA/F/E64WRFsOuqHDful/kAG5tXSoNc2zqu+vVi5G+ZCR3RVfHOaW ICCicZSq3jkSaWNfnwpfbmuc5Kci88NVeX1d7ad+7hhJnLVLWkDWjH7ndsn7io5Dj1vE= Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The only caller of this new function is inside of an #ifdef checking for CONFIG_BRIDGE_IGMP_SNOOPING, so we should move the implementation there too, in order to avoid this harmless warning: net/bridge/br_forward.c:177:13: error: 'maybe_deliver_addr' defined but not used [-Werror=unused-function] Fixes: 6db6f0eae605 ("bridge: multicast to unicast") Signed-off-by: Arnd Bergmann --- net/bridge/br_forward.c | 50 ++++++++++++++++++++++++------------------------- 1 file changed, 25 insertions(+), 25 deletions(-) diff --git a/net/bridge/br_forward.c b/net/bridge/br_forward.c index a0f9d0037d24..5a1f8ef49899 100644 --- a/net/bridge/br_forward.c +++ b/net/bridge/br_forward.c @@ -174,31 +174,6 @@ static struct net_bridge_port *maybe_deliver( return p; } -static void maybe_deliver_addr(struct net_bridge_port *p, struct sk_buff *skb, - const unsigned char *addr, bool local_orig) -{ - struct net_device *dev = BR_INPUT_SKB_CB(skb)->brdev; - const unsigned char *src = eth_hdr(skb)->h_source; - - if (!should_deliver(p, skb)) - return; - - /* Even with hairpin, no soliloquies - prevent breaking IPv6 DAD */ - if (skb->dev == p->dev && ether_addr_equal(src, addr)) - return; - - skb = skb_copy(skb, GFP_ATOMIC); - if (!skb) { - dev->stats.tx_dropped++; - return; - } - - if (!is_broadcast_ether_addr(addr)) - memcpy(eth_hdr(skb)->h_dest, addr, ETH_ALEN); - - __br_forward(p, skb, local_orig); -} - /* called under rcu_read_lock */ void br_flood(struct net_bridge *br, struct sk_buff *skb, enum br_pkt_type pkt_type, bool local_rcv, bool local_orig) @@ -245,6 +220,31 @@ void br_flood(struct net_bridge *br, struct sk_buff *skb, } #ifdef CONFIG_BRIDGE_IGMP_SNOOPING +static void maybe_deliver_addr(struct net_bridge_port *p, struct sk_buff *skb, + const unsigned char *addr, bool local_orig) +{ + struct net_device *dev = BR_INPUT_SKB_CB(skb)->brdev; + const unsigned char *src = eth_hdr(skb)->h_source; + + if (!should_deliver(p, skb)) + return; + + /* Even with hairpin, no soliloquies - prevent breaking IPv6 DAD */ + if (skb->dev == p->dev && ether_addr_equal(src, addr)) + return; + + skb = skb_copy(skb, GFP_ATOMIC); + if (!skb) { + dev->stats.tx_dropped++; + return; + } + + if (!is_broadcast_ether_addr(addr)) + memcpy(eth_hdr(skb)->h_dest, addr, ETH_ALEN); + + __br_forward(p, skb, local_orig); +} + /* called with rcu_read_lock */ void br_multicast_flood(struct net_bridge_mdb_entry *mdst, struct sk_buff *skb, -- 2.9.0