From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752109AbdAZAk5 (ORCPT ); Wed, 25 Jan 2017 19:40:57 -0500 Received: from mail-pg0-f52.google.com ([74.125.83.52]:33154 "EHLO mail-pg0-f52.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751556AbdAZAk4 (ORCPT ); Wed, 25 Jan 2017 19:40:56 -0500 Date: Wed, 25 Jan 2017 16:40:48 -0800 From: Stephen Hemminger To: Arnd Bergmann Cc: "David S. Miller" , Linus =?UTF-8?B?TMO8c3Npbmc=?= , Nikolay Aleksandrov , Felix Fietkau , bridge@lists.linux-foundation.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH] [net-next] bridge: move maybe_deliver_addr() inside #ifdef Message-ID: <20170125164048.1fc85758@xeon-e3> In-Reply-To: <20170125222950.1352566-1-arnd@arndb.de> References: <20170125222950.1352566-1-arnd@arndb.de> MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Wed, 25 Jan 2017 23:29:33 +0100 Arnd Bergmann wrote: > 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, Acked-by: Stephen Hemminger