xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bonding: convert all_slaves_active to use the new option API

Browse Source 
This patch adds the necessary changes so all_slaves_active would use
the new bonding option API.

Signed-off-by: Nikolay Aleksandrov <nikolay@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Nikolay Aleksandrov
2014-01-22 14:53:37 +01:00
committed by David S. Miller
parent 24089ba102
commit 3df0116251
5 changed files with 25 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
drivers/net/bonding/bond_options.c
View File

@@ -105,6 +105,12 @@ static struct bond_opt_value bond_use_carrier_tbl[] = {
{ NULL, -1, 0}
};
static struct bond_opt_value bond_all_slaves_active_tbl[] = {
{ "off", 0, BOND_VALFLAG_DEFAULT},
{ "on", 1, 0},
{ NULL, -1, 0}
};
static struct bond_option bond_opts[] = {
[BOND_OPT_MODE] = {
.id = BOND_OPT_MODE,
@@ -261,6 +267,13 @@ static struct bond_option bond_opts[] = {
.flags = BOND_OPTFLAG_RAWVAL,
.set = bond_option_queue_id_set
},
[BOND_OPT_ALL_SLAVES_ACTIVE] = {
.id = BOND_OPT_ALL_SLAVES_ACTIVE,
.name = "all_slaves_active",
.desc = "Keep all frames received on an interface by setting active flag for all slaves",
.values = bond_all_slaves_active_tbl,
.set = bond_option_all_slaves_active_set
},
{ }
};
@@ -1049,25 +1062,17 @@ int bond_option_num_peer_notif_set(struct bonding *bond,
}
int bond_option_all_slaves_active_set(struct bonding *bond,
int all_slaves_active)
struct bond_opt_value *newval)
{
struct list_head *iter;
struct slave *slave;
if (all_slaves_active == bond->params.all_slaves_active)
if (newval->value == bond->params.all_slaves_active)
return 0;
if ((all_slaves_active == 0) || (all_slaves_active == 1)) {
bond->params.all_slaves_active = all_slaves_active;
} else {
pr_info("%s: Ignoring invalid all_slaves_active value %d.\n",
bond->dev->name, all_slaves_active);
return -EINVAL;
}
bond->params.all_slaves_active = newval->value;
bond_for_each_slave(bond, slave, iter) {
if (!bond_is_active_slave(slave)) {
if (all_slaves_active)
if (newval->value)
slave->inactive = 0;
else
slave->inactive = 1;