Commit 90194264 authored by Joe Perches's avatar Joe Perches Committed by David S. Miller

bonding: Neaten pr_<level>

Add missing terminating newlines.
Convert uses of pr_info to pr_cont in bond_check_params.
Standardize upper/lower case styles.
Typo fixes, remove unnecessary parentheses and periods.
Alignment neatening.
Signed-off-by: default avatarJoe Perches <joe@perches.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 91565ebb
...@@ -1079,7 +1079,8 @@ static void ad_rx_machine(struct lacpdu *lacpdu, struct port *port) ...@@ -1079,7 +1079,8 @@ static void ad_rx_machine(struct lacpdu *lacpdu, struct port *port)
/* detect loopback situation */ /* detect loopback situation */
if (MAC_ADDRESS_EQUAL(&(lacpdu->actor_system), if (MAC_ADDRESS_EQUAL(&(lacpdu->actor_system),
&(port->actor_system))) { &(port->actor_system))) {
pr_err("%s: An illegal loopback occurred on adapter (%s).\nCheck the configuration to verify that all adapters are connected to 802.3ad compliant switch ports\n", pr_err("%s: An illegal loopback occurred on adapter (%s)\n"
"Check the configuration to verify that all adapters are connected to 802.3ad compliant switch ports\n",
port->slave->bond->dev->name, port->slave->bond->dev->name,
port->slave->dev->name); port->slave->dev->name);
return; return;
...@@ -1950,7 +1951,7 @@ void bond_3ad_unbind_slave(struct slave *slave) ...@@ -1950,7 +1951,7 @@ void bond_3ad_unbind_slave(struct slave *slave)
* new aggregator * new aggregator
*/ */
if ((new_aggregator) && ((!new_aggregator->lag_ports) || ((new_aggregator->lag_ports == port) && !new_aggregator->lag_ports->next_port_in_aggregator))) { if ((new_aggregator) && ((!new_aggregator->lag_ports) || ((new_aggregator->lag_ports == port) && !new_aggregator->lag_ports->next_port_in_aggregator))) {
pr_debug("Some port(s) related to LAG %d - replaceing with LAG %d\n", pr_debug("Some port(s) related to LAG %d - replacing with LAG %d\n",
aggregator->aggregator_identifier, aggregator->aggregator_identifier,
new_aggregator->aggregator_identifier); new_aggregator->aggregator_identifier);
...@@ -2300,9 +2301,9 @@ void bond_3ad_handle_link_change(struct slave *slave, char link) ...@@ -2300,9 +2301,9 @@ void bond_3ad_handle_link_change(struct slave *slave, char link)
port->actor_oper_port_key = (port->actor_admin_port_key &= port->actor_oper_port_key = (port->actor_admin_port_key &=
~AD_SPEED_KEY_BITS); ~AD_SPEED_KEY_BITS);
} }
pr_debug("Port %d changed link status to %s", pr_debug("Port %d changed link status to %s\n",
port->actor_port_number, port->actor_port_number,
(link == BOND_LINK_UP) ? "UP" : "DOWN"); link == BOND_LINK_UP ? "UP" : "DOWN");
/* there is no need to reselect a new aggregator, just signal the /* there is no need to reselect a new aggregator, just signal the
* state machines to reinitialize * state machines to reinitialize
*/ */
......
This diff is collapsed.
...@@ -181,7 +181,7 @@ static int bond_changelink(struct net_device *bond_dev, ...@@ -181,7 +181,7 @@ static int bond_changelink(struct net_device *bond_dev,
int arp_interval = nla_get_u32(data[IFLA_BOND_ARP_INTERVAL]); int arp_interval = nla_get_u32(data[IFLA_BOND_ARP_INTERVAL]);
if (arp_interval && miimon) { if (arp_interval && miimon) {
pr_err("%s: ARP monitoring cannot be used with MII monitoring.\n", pr_err("%s: ARP monitoring cannot be used with MII monitoring\n",
bond->dev->name); bond->dev->name);
return -EINVAL; return -EINVAL;
} }
...@@ -207,7 +207,7 @@ static int bond_changelink(struct net_device *bond_dev, ...@@ -207,7 +207,7 @@ static int bond_changelink(struct net_device *bond_dev,
i++; i++;
} }
if (i == 0 && bond->params.arp_interval) if (i == 0 && bond->params.arp_interval)
pr_warn("%s: removing last arp target with arp_interval on\n", pr_warn("%s: Removing last arp target with arp_interval on\n",
bond->dev->name); bond->dev->name);
if (err) if (err)
return err; return err;
...@@ -216,7 +216,7 @@ static int bond_changelink(struct net_device *bond_dev, ...@@ -216,7 +216,7 @@ static int bond_changelink(struct net_device *bond_dev,
int arp_validate = nla_get_u32(data[IFLA_BOND_ARP_VALIDATE]); int arp_validate = nla_get_u32(data[IFLA_BOND_ARP_VALIDATE]);
if (arp_validate && miimon) { if (arp_validate && miimon) {
pr_err("%s: ARP validating cannot be used with MII monitoring.\n", pr_err("%s: ARP validating cannot be used with MII monitoring\n",
bond->dev->name); bond->dev->name);
return -EINVAL; return -EINVAL;
} }
......
This diff is collapsed.
...@@ -281,7 +281,7 @@ void __net_init bond_create_proc_dir(struct bond_net *bn) ...@@ -281,7 +281,7 @@ void __net_init bond_create_proc_dir(struct bond_net *bn)
if (!bn->proc_dir) { if (!bn->proc_dir) {
bn->proc_dir = proc_mkdir(DRV_NAME, bn->net->proc_net); bn->proc_dir = proc_mkdir(DRV_NAME, bn->net->proc_net);
if (!bn->proc_dir) if (!bn->proc_dir)
pr_warn("Warning: cannot create /proc/net/%s\n", pr_warn("Warning: Cannot create /proc/net/%s\n",
DRV_NAME); DRV_NAME);
} }
} }
......
...@@ -117,9 +117,9 @@ static ssize_t bonding_store_bonds(struct class *cls, ...@@ -117,9 +117,9 @@ static ssize_t bonding_store_bonds(struct class *cls,
rv = bond_create(bn->net, ifname); rv = bond_create(bn->net, ifname);
if (rv) { if (rv) {
if (rv == -EEXIST) if (rv == -EEXIST)
pr_info("%s already exists.\n", ifname); pr_info("%s already exists\n", ifname);
else else
pr_info("%s creation failed.\n", ifname); pr_info("%s creation failed\n", ifname);
res = rv; res = rv;
} }
} else if (command[0] == '-') { } else if (command[0] == '-') {
...@@ -144,7 +144,7 @@ static ssize_t bonding_store_bonds(struct class *cls, ...@@ -144,7 +144,7 @@ static ssize_t bonding_store_bonds(struct class *cls,
return res; return res;
err_no_cmd: err_no_cmd:
pr_err("no command found in bonding_masters. Use +ifname or -ifname.\n"); pr_err("no command found in bonding_masters - use +ifname or -ifname\n");
return -EPERM; return -EPERM;
} }
...@@ -1135,7 +1135,7 @@ int bond_create_sysfs(struct bond_net *bn) ...@@ -1135,7 +1135,7 @@ int bond_create_sysfs(struct bond_net *bn)
/* Is someone being kinky and naming a device bonding_master? */ /* Is someone being kinky and naming a device bonding_master? */
if (__dev_get_by_name(bn->net, if (__dev_get_by_name(bn->net,
class_attr_bonding_masters.attr.name)) class_attr_bonding_masters.attr.name))
pr_err("network device named %s already exists in sysfs", pr_err("network device named %s already exists in sysfs\n",
class_attr_bonding_masters.attr.name); class_attr_bonding_masters.attr.name);
ret = 0; ret = 0;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment