* [PATCH net-next 2/3] bonding: clean the primary slave if there is no slave matching new primary
@ 2014-01-14 2:37 Ding Tianhong
2014-01-14 6:42 ` Veaceslav Falico
0 siblings, 1 reply; 2+ messages in thread
From: Ding Tianhong @ 2014-01-14 2:37 UTC (permalink / raw)
To: Jay Vosburgh, Veaceslav Falico, David S. Miller, Netdev
If the new primay is not matching any slave in the bond, the bond should
record it to params, clean the primary slave and select a new active slave.
Signed-off-by: Ding Tianhong <dingtianhong@huawei.com>
---
drivers/net/bonding/bond_options.c | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/drivers/net/bonding/bond_options.c b/drivers/net/bonding/bond_options.c
index 945a666..0ee0bfe 100644
--- a/drivers/net/bonding/bond_options.c
+++ b/drivers/net/bonding/bond_options.c
@@ -512,6 +512,12 @@ int bond_option_primary_set(struct bonding *bond, const char *primary)
}
}
+ if (bond->primary_slave) {
+ pr_info("%s: Setting primary slave to None.\n",
+ bond->dev->name);
+ bond->primary_slave = NULL;
+ bond_select_active_slave(bond);
+ }
strncpy(bond->params.primary, primary, IFNAMSIZ);
bond->params.primary[IFNAMSIZ - 1] = 0;
--
1.8.0
^ permalink raw reply related [flat|nested] 2+ messages in thread* Re: [PATCH net-next 2/3] bonding: clean the primary slave if there is no slave matching new primary
2014-01-14 2:37 [PATCH net-next 2/3] bonding: clean the primary slave if there is no slave matching new primary Ding Tianhong
@ 2014-01-14 6:42 ` Veaceslav Falico
0 siblings, 0 replies; 2+ messages in thread
From: Veaceslav Falico @ 2014-01-14 6:42 UTC (permalink / raw)
To: Ding Tianhong; +Cc: Jay Vosburgh, David S. Miller, Netdev
On Tue, Jan 14, 2014 at 10:37:00AM +0800, Ding Tianhong wrote:
>If the new primay is not matching any slave in the bond, the bond should
>record it to params, clean the primary slave and select a new active slave.
This one looks good.
>
>Signed-off-by: Ding Tianhong <dingtianhong@huawei.com>
>---
> drivers/net/bonding/bond_options.c | 6 ++++++
> 1 file changed, 6 insertions(+)
>
>diff --git a/drivers/net/bonding/bond_options.c b/drivers/net/bonding/bond_options.c
>index 945a666..0ee0bfe 100644
>--- a/drivers/net/bonding/bond_options.c
>+++ b/drivers/net/bonding/bond_options.c
>@@ -512,6 +512,12 @@ int bond_option_primary_set(struct bonding *bond, const char *primary)
> }
> }
>
>+ if (bond->primary_slave) {
>+ pr_info("%s: Setting primary slave to None.\n",
>+ bond->dev->name);
>+ bond->primary_slave = NULL;
>+ bond_select_active_slave(bond);
>+ }
> strncpy(bond->params.primary, primary, IFNAMSIZ);
> bond->params.primary[IFNAMSIZ - 1] = 0;
>
>--
>1.8.0
>
>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2014-01-14 6:45 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-01-14 2:37 [PATCH net-next 2/3] bonding: clean the primary slave if there is no slave matching new primary Ding Tianhong
2014-01-14 6:42 ` Veaceslav Falico
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).