diff options
Diffstat (limited to 'drivers/net/bonding/bond_sysfs.c')
-rw-r--r-- | drivers/net/bonding/bond_sysfs.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/drivers/net/bonding/bond_sysfs.c b/drivers/net/bonding/bond_sysfs.c index 643fcc110299..0e8b268da0a0 100644 --- a/drivers/net/bonding/bond_sysfs.c +++ b/drivers/net/bonding/bond_sysfs.c | |||
@@ -117,9 +117,9 @@ static ssize_t bonding_store_bonds(struct class *cls, | |||
117 | rv = bond_create(bn->net, ifname); | 117 | rv = bond_create(bn->net, ifname); |
118 | if (rv) { | 118 | if (rv) { |
119 | if (rv == -EEXIST) | 119 | if (rv == -EEXIST) |
120 | pr_info("%s already exists.\n", ifname); | 120 | pr_info("%s already exists\n", ifname); |
121 | else | 121 | else |
122 | pr_info("%s creation failed.\n", ifname); | 122 | pr_info("%s creation failed\n", ifname); |
123 | res = rv; | 123 | res = rv; |
124 | } | 124 | } |
125 | } else if (command[0] == '-') { | 125 | } else if (command[0] == '-') { |
@@ -144,7 +144,7 @@ static ssize_t bonding_store_bonds(struct class *cls, | |||
144 | return res; | 144 | return res; |
145 | 145 | ||
146 | err_no_cmd: | 146 | err_no_cmd: |
147 | pr_err("no command found in bonding_masters. Use +ifname or -ifname.\n"); | 147 | pr_err("no command found in bonding_masters - use +ifname or -ifname\n"); |
148 | return -EPERM; | 148 | return -EPERM; |
149 | } | 149 | } |
150 | 150 | ||
@@ -220,7 +220,7 @@ static ssize_t bonding_show_mode(struct device *d, | |||
220 | struct device_attribute *attr, char *buf) | 220 | struct device_attribute *attr, char *buf) |
221 | { | 221 | { |
222 | struct bonding *bond = to_bond(d); | 222 | struct bonding *bond = to_bond(d); |
223 | struct bond_opt_value *val; | 223 | const struct bond_opt_value *val; |
224 | 224 | ||
225 | val = bond_opt_get_val(BOND_OPT_MODE, bond->params.mode); | 225 | val = bond_opt_get_val(BOND_OPT_MODE, bond->params.mode); |
226 | 226 | ||
@@ -251,7 +251,7 @@ static ssize_t bonding_show_xmit_hash(struct device *d, | |||
251 | char *buf) | 251 | char *buf) |
252 | { | 252 | { |
253 | struct bonding *bond = to_bond(d); | 253 | struct bonding *bond = to_bond(d); |
254 | struct bond_opt_value *val; | 254 | const struct bond_opt_value *val; |
255 | 255 | ||
256 | val = bond_opt_get_val(BOND_OPT_XMIT_HASH, bond->params.xmit_policy); | 256 | val = bond_opt_get_val(BOND_OPT_XMIT_HASH, bond->params.xmit_policy); |
257 | 257 | ||
@@ -282,7 +282,7 @@ static ssize_t bonding_show_arp_validate(struct device *d, | |||
282 | char *buf) | 282 | char *buf) |
283 | { | 283 | { |
284 | struct bonding *bond = to_bond(d); | 284 | struct bonding *bond = to_bond(d); |
285 | struct bond_opt_value *val; | 285 | const struct bond_opt_value *val; |
286 | 286 | ||
287 | val = bond_opt_get_val(BOND_OPT_ARP_VALIDATE, | 287 | val = bond_opt_get_val(BOND_OPT_ARP_VALIDATE, |
288 | bond->params.arp_validate); | 288 | bond->params.arp_validate); |
@@ -314,7 +314,7 @@ static ssize_t bonding_show_arp_all_targets(struct device *d, | |||
314 | char *buf) | 314 | char *buf) |
315 | { | 315 | { |
316 | struct bonding *bond = to_bond(d); | 316 | struct bonding *bond = to_bond(d); |
317 | struct bond_opt_value *val; | 317 | const struct bond_opt_value *val; |
318 | 318 | ||
319 | val = bond_opt_get_val(BOND_OPT_ARP_ALL_TARGETS, | 319 | val = bond_opt_get_val(BOND_OPT_ARP_ALL_TARGETS, |
320 | bond->params.arp_all_targets); | 320 | bond->params.arp_all_targets); |
@@ -348,7 +348,7 @@ static ssize_t bonding_show_fail_over_mac(struct device *d, | |||
348 | char *buf) | 348 | char *buf) |
349 | { | 349 | { |
350 | struct bonding *bond = to_bond(d); | 350 | struct bonding *bond = to_bond(d); |
351 | struct bond_opt_value *val; | 351 | const struct bond_opt_value *val; |
352 | 352 | ||
353 | val = bond_opt_get_val(BOND_OPT_FAIL_OVER_MAC, | 353 | val = bond_opt_get_val(BOND_OPT_FAIL_OVER_MAC, |
354 | bond->params.fail_over_mac); | 354 | bond->params.fail_over_mac); |
@@ -505,7 +505,7 @@ static ssize_t bonding_show_lacp(struct device *d, | |||
505 | char *buf) | 505 | char *buf) |
506 | { | 506 | { |
507 | struct bonding *bond = to_bond(d); | 507 | struct bonding *bond = to_bond(d); |
508 | struct bond_opt_value *val; | 508 | const struct bond_opt_value *val; |
509 | 509 | ||
510 | val = bond_opt_get_val(BOND_OPT_LACP_RATE, bond->params.lacp_fast); | 510 | val = bond_opt_get_val(BOND_OPT_LACP_RATE, bond->params.lacp_fast); |
511 | 511 | ||
@@ -558,7 +558,7 @@ static ssize_t bonding_show_ad_select(struct device *d, | |||
558 | char *buf) | 558 | char *buf) |
559 | { | 559 | { |
560 | struct bonding *bond = to_bond(d); | 560 | struct bonding *bond = to_bond(d); |
561 | struct bond_opt_value *val; | 561 | const struct bond_opt_value *val; |
562 | 562 | ||
563 | val = bond_opt_get_val(BOND_OPT_AD_SELECT, bond->params.ad_select); | 563 | val = bond_opt_get_val(BOND_OPT_AD_SELECT, bond->params.ad_select); |
564 | 564 | ||
@@ -686,7 +686,7 @@ static ssize_t bonding_show_primary_reselect(struct device *d, | |||
686 | char *buf) | 686 | char *buf) |
687 | { | 687 | { |
688 | struct bonding *bond = to_bond(d); | 688 | struct bonding *bond = to_bond(d); |
689 | struct bond_opt_value *val; | 689 | const struct bond_opt_value *val; |
690 | 690 | ||
691 | val = bond_opt_get_val(BOND_OPT_PRIMARY_RESELECT, | 691 | val = bond_opt_get_val(BOND_OPT_PRIMARY_RESELECT, |
692 | bond->params.primary_reselect); | 692 | bond->params.primary_reselect); |
@@ -1135,7 +1135,7 @@ int bond_create_sysfs(struct bond_net *bn) | |||
1135 | /* Is someone being kinky and naming a device bonding_master? */ | 1135 | /* Is someone being kinky and naming a device bonding_master? */ |
1136 | if (__dev_get_by_name(bn->net, | 1136 | if (__dev_get_by_name(bn->net, |
1137 | class_attr_bonding_masters.attr.name)) | 1137 | class_attr_bonding_masters.attr.name)) |
1138 | pr_err("network device named %s already exists in sysfs", | 1138 | pr_err("network device named %s already exists in sysfs\n", |
1139 | class_attr_bonding_masters.attr.name); | 1139 | class_attr_bonding_masters.attr.name); |
1140 | ret = 0; | 1140 | ret = 0; |
1141 | } | 1141 | } |