From mboxrd@z Thu Jan 1 00:00:00 1970 From: Andy Gospodarek Subject: Re: [PATCH net-next] bonding: make release_and_destroy static Date: Fri, 15 Oct 2010 11:37:25 -0400 Message-ID: <20101015153725.GC7497@gospo.rdu.redhat.com> References: <20101015080934.6dc28388@nehalam> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Cc: Jay Vosburgh , David Miller , bonding-devel@lists.sourceforge.net, netdev@vger.kernel.org To: Stephen Hemminger Return-path: Received: from mx1.redhat.com ([209.132.183.28]:55853 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755828Ab0JOPhf (ORCPT ); Fri, 15 Oct 2010 11:37:35 -0400 Content-Disposition: inline In-Reply-To: <20101015080934.6dc28388@nehalam> Sender: netdev-owner@vger.kernel.org List-ID: On Fri, Oct 15, 2010 at 08:09:34AM -0700, Stephen Hemminger wrote: > Only used in main file. > > Signed-off-by: Stephen Hemminger > > --- a/drivers/net/bonding/bond_main.c 2010-10-15 08:07:14.163898236 -0700 > +++ b/drivers/net/bonding/bond_main.c 2010-10-15 08:07:31.956373660 -0700 > @@ -2057,8 +2057,8 @@ int bond_release(struct net_device *bond > * First release a slave and than destroy the bond if no more slaves are left. > * Must be under rtnl_lock when this function is called. > */ > -int bond_release_and_destroy(struct net_device *bond_dev, > - struct net_device *slave_dev) > +static int bond_release_and_destroy(struct net_device *bond_dev, > + struct net_device *slave_dev) > { > struct bonding *bond = netdev_priv(bond_dev); > int ret; > --- a/drivers/net/bonding/bonding.h 2010-10-15 08:07:14.179898632 -0700 > +++ b/drivers/net/bonding/bonding.h 2010-10-15 08:07:31.956373660 -0700 > @@ -334,7 +334,6 @@ static inline void bond_unset_master_alb > struct vlan_entry *bond_next_vlan(struct bonding *bond, struct vlan_entry *curr); > int bond_dev_queue_xmit(struct bonding *bond, struct sk_buff *skb, struct net_device *slave_dev); > int bond_create(struct net *net, const char *name); > -int bond_release_and_destroy(struct net_device *bond_dev, struct net_device *slave_dev); > int bond_create_sysfs(void); > void bond_destroy_sysfs(void); > void bond_prepare_sysfs_group(struct bonding *bond); Seems fine. Acked-by: Andy Gospodarek