* [PATCH net-next] bonding: make release_and_destroy static
@ 2010-10-15 15:09 Stephen Hemminger
2010-10-15 15:37 ` Andy Gospodarek
2010-10-21 10:15 ` David Miller
0 siblings, 2 replies; 4+ messages in thread
From: Stephen Hemminger @ 2010-10-15 15:09 UTC (permalink / raw)
To: Jay Vosburgh, David Miller; +Cc: bonding-devel, netdev
Only used in main file.
Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
--- 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);
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH net-next] bonding: make release_and_destroy static
2010-10-15 15:09 [PATCH net-next] bonding: make release_and_destroy static Stephen Hemminger
@ 2010-10-15 15:37 ` Andy Gospodarek
2010-10-15 23:16 ` [Bonding-devel] " Jay Vosburgh
2010-10-21 10:15 ` David Miller
1 sibling, 1 reply; 4+ messages in thread
From: Andy Gospodarek @ 2010-10-15 15:37 UTC (permalink / raw)
To: Stephen Hemminger; +Cc: Jay Vosburgh, David Miller, bonding-devel, netdev
On Fri, Oct 15, 2010 at 08:09:34AM -0700, Stephen Hemminger wrote:
> Only used in main file.
>
> Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
>
> --- 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 <andy@greyhouse.net>
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [Bonding-devel] [PATCH net-next] bonding: make release_and_destroy static
2010-10-15 15:37 ` Andy Gospodarek
@ 2010-10-15 23:16 ` Jay Vosburgh
0 siblings, 0 replies; 4+ messages in thread
From: Jay Vosburgh @ 2010-10-15 23:16 UTC (permalink / raw)
To: Andy Gospodarek; +Cc: Stephen Hemminger, netdev, David Miller, bonding-devel
Andy Gospodarek <andy@greyhouse.net> wrote:
>On Fri, Oct 15, 2010 at 08:09:34AM -0700, Stephen Hemminger wrote:
>> Only used in main file.
>>
>> Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
>>
>> --- 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 <andy@greyhouse.net>
Signed-off-by: Jay Vosburgh <fubar@us.ibm.com>
-J
---
-Jay Vosburgh, IBM Linux Technology Center, fubar@us.ibm.com
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH net-next] bonding: make release_and_destroy static
2010-10-15 15:09 [PATCH net-next] bonding: make release_and_destroy static Stephen Hemminger
2010-10-15 15:37 ` Andy Gospodarek
@ 2010-10-21 10:15 ` David Miller
1 sibling, 0 replies; 4+ messages in thread
From: David Miller @ 2010-10-21 10:15 UTC (permalink / raw)
To: shemminger; +Cc: fubar, bonding-devel, netdev
From: Stephen Hemminger <shemminger@vyatta.com>
Date: Fri, 15 Oct 2010 08:09:34 -0700
> Only used in main file.
>
> Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
Applied.
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2010-10-21 10:14 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-10-15 15:09 [PATCH net-next] bonding: make release_and_destroy static Stephen Hemminger
2010-10-15 15:37 ` Andy Gospodarek
2010-10-15 23:16 ` [Bonding-devel] " Jay Vosburgh
2010-10-21 10:15 ` David Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).