* [PATCH net] bonding: don't change to 802.3ad mode while ARP monitor is running
@ 2013-11-15 10:02 Ding Tianhong
2013-11-16 1:40 ` David Miller
0 siblings, 1 reply; 3+ messages in thread
From: Ding Tianhong @ 2013-11-15 10:02 UTC (permalink / raw)
To: Jay Vosburgh, Andy Gospodarek, David S. Miller,
Nikolay Aleksandrov, Veaceslav Falico, Netdev
Because the ARP monitor is not support for 802.3ad, but We still
could change the mode to 802.3ad from ab mode while ARP monirot
is running, it is incorrect.
So add a check for 802.3ad in bonding_store_mode to fix the problem,
and make a micro program to simplify the code.
Signed-off-by: Ding Tianhong <dingtianhong@huawei.com>
---
drivers/net/bonding/bond_options.c | 2 +-
drivers/net/bonding/bonding.h | 4 ++++
2 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/drivers/net/bonding/bond_options.c b/drivers/net/bonding/bond_options.c
index 9a5223c..abb4218 100644
--- a/drivers/net/bonding/bond_options.c
+++ b/drivers/net/bonding/bond_options.c
@@ -45,7 +45,7 @@ int bond_option_mode_set(struct bonding *bond, int mode)
return -EPERM;
}
- if (BOND_MODE_IS_LB(mode) && bond->params.arp_interval) {
+ if (BOND_NO_USES_ARP(mode) && bond->params.arp_interval) {
pr_err("%s: %s mode is incompatible with arp monitoring.\n",
bond->dev->name, bond_mode_tbl[mode].modename);
return -EINVAL;
diff --git a/drivers/net/bonding/bonding.h b/drivers/net/bonding/bonding.h
index 046a605..e2c11cb 100644
--- a/drivers/net/bonding/bonding.h
+++ b/drivers/net/bonding/bonding.h
@@ -63,6 +63,10 @@
(((mode) == BOND_MODE_TLB) || \
((mode) == BOND_MODE_ALB))
+#define BOND_NO_USES_ARP(mode) \
+ (((mode) == BOND_MODE_8023AD) || \
+ ((mode) == BOND_MODE_TLB) || \
+ ((mode) == BOND_MODE_ALB))
/*
* Less bad way to call ioctl from within the kernel; this needs to be
* done some other way to get the call out of interrupt context.
--
1.7.12
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH net] bonding: don't change to 802.3ad mode while ARP monitor is running
2013-11-15 10:02 [PATCH net] bonding: don't change to 802.3ad mode while ARP monitor is running Ding Tianhong
@ 2013-11-16 1:40 ` David Miller
2013-11-16 1:52 ` Ding Tianhong
0 siblings, 1 reply; 3+ messages in thread
From: David Miller @ 2013-11-16 1:40 UTC (permalink / raw)
To: dingtianhong; +Cc: fubar, andy, nikolay, vfalico, netdev
From: Ding Tianhong <dingtianhong@huawei.com>
Date: Fri, 15 Nov 2013 18:02:18 +0800
> Because the ARP monitor is not support for 802.3ad, but We still
^^^^^^^
"supported"
No need to capitalize "We".
> could change the mode to 802.3ad from ab mode while ARP monirot
^^^^^^^
"monitor"
> is running, it is incorrect.
>
> So add a check for 802.3ad in bonding_store_mode to fix the problem,
> and make a micro program to simplify the code.
What is a "micro program"?
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH net] bonding: don't change to 802.3ad mode while ARP monitor is running
2013-11-16 1:40 ` David Miller
@ 2013-11-16 1:52 ` Ding Tianhong
0 siblings, 0 replies; 3+ messages in thread
From: Ding Tianhong @ 2013-11-16 1:52 UTC (permalink / raw)
To: David Miller; +Cc: dingtianhong, fubar, andy, nikolay, vfalico, netdev
于 2013/11/16 9:40, David Miller 写道:
> From: Ding Tianhong <dingtianhong@huawei.com>
> Date: Fri, 15 Nov 2013 18:02:18 +0800
>
>> Because the ARP monitor is not support for 802.3ad, but We still
> ^^^^^^^
>
> "supported"
>
> No need to capitalize "We".
>
>> could change the mode to 802.3ad from ab mode while ARP monirot
> ^^^^^^^
>
> "monitor"
>
>> is running, it is incorrect.
>>
>> So add a check for 802.3ad in bonding_store_mode to fix the problem,
>> and make a micro program to simplify the code.
> What is a "micro program"?
sorry, not review the changelog yet,I will resend it and it will not be
happend again.
Regards
Ding
> --
> To unsubscribe from this list: send the line "unsubscribe netdev" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
>
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2013-11-16 2:03 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-11-15 10:02 [PATCH net] bonding: don't change to 802.3ad mode while ARP monitor is running Ding Tianhong
2013-11-16 1:40 ` David Miller
2013-11-16 1:52 ` Ding Tianhong
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).