You've already forked linux-apfs
mirror of
https://github.com/linux-apfs/linux-apfs.git
synced 2026-05-01 15:00:59 -07:00
Merge branch 'bonding-next'
Veaceslav Falico says: ==================== bonding: convert pr_* to netdev_* Currently bonding uses pr_info/warn/etc. function to print something, while it's encouraged to use netdev_info/warn/etc. in net/. This patchset converts them where possible (i.e. where we have a working net_device). Also, convert pr_ratelimit* to net_() and remove the pr_fmt, to unify netdev_* and pr_* outputs. ==================== CC: Jay Vosburgh <j.vosburgh@gmail.com> CC: Andy Gospodarek <andy@greyhouse.net> Signed-off-by: Veaceslav Falico <vfalico@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
@@ -20,8 +20,6 @@
|
||||
*
|
||||
*/
|
||||
|
||||
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
|
||||
|
||||
#include <linux/skbuff.h>
|
||||
#include <linux/if_ether.h>
|
||||
#include <linux/netdevice.h>
|
||||
@@ -301,8 +299,8 @@ static u16 __get_link_speed(struct port *port)
|
||||
}
|
||||
}
|
||||
|
||||
pr_debug("Port %d Received link speed %d update from adapter\n",
|
||||
port->actor_port_number, speed);
|
||||
netdev_dbg(slave->bond->dev, "Port %d Received link speed %d update from adapter\n",
|
||||
port->actor_port_number, speed);
|
||||
return speed;
|
||||
}
|
||||
|
||||
@@ -329,14 +327,14 @@ static u8 __get_duplex(struct port *port)
|
||||
switch (slave->duplex) {
|
||||
case DUPLEX_FULL:
|
||||
retval = 0x1;
|
||||
pr_debug("Port %d Received status full duplex update from adapter\n",
|
||||
port->actor_port_number);
|
||||
netdev_dbg(slave->bond->dev, "Port %d Received status full duplex update from adapter\n",
|
||||
port->actor_port_number);
|
||||
break;
|
||||
case DUPLEX_HALF:
|
||||
default:
|
||||
retval = 0x0;
|
||||
pr_debug("Port %d Received status NOT full duplex update from adapter\n",
|
||||
port->actor_port_number);
|
||||
netdev_dbg(slave->bond->dev, "Port %d Received status NOT full duplex update from adapter\n",
|
||||
port->actor_port_number);
|
||||
break;
|
||||
}
|
||||
}
|
||||
@@ -1079,9 +1077,8 @@ static void ad_rx_machine(struct lacpdu *lacpdu, struct port *port)
|
||||
/* detect loopback situation */
|
||||
if (MAC_ADDRESS_EQUAL(&(lacpdu->actor_system),
|
||||
&(port->actor_system))) {
|
||||
pr_err("%s: An illegal loopback occurred on adapter (%s)\n"
|
||||
netdev_err(port->slave->bond->dev, "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->dev->name);
|
||||
return;
|
||||
}
|
||||
@@ -1269,9 +1266,9 @@ static void ad_port_selection_logic(struct port *port)
|
||||
port->next_port_in_aggregator = NULL;
|
||||
port->actor_port_aggregator_identifier = 0;
|
||||
|
||||
pr_debug("Port %d left LAG %d\n",
|
||||
port->actor_port_number,
|
||||
temp_aggregator->aggregator_identifier);
|
||||
netdev_dbg(bond->dev, "Port %d left LAG %d\n",
|
||||
port->actor_port_number,
|
||||
temp_aggregator->aggregator_identifier);
|
||||
/* if the aggregator is empty, clear its
|
||||
* parameters, and set it ready to be attached
|
||||
*/
|
||||
@@ -1284,11 +1281,11 @@ static void ad_port_selection_logic(struct port *port)
|
||||
/* meaning: the port was related to an aggregator
|
||||
* but was not on the aggregator port list
|
||||
*/
|
||||
pr_warn_ratelimited("%s: Warning: Port %d (on %s) was related to aggregator %d but was not on its port list\n",
|
||||
port->slave->bond->dev->name,
|
||||
port->actor_port_number,
|
||||
port->slave->dev->name,
|
||||
port->aggregator->aggregator_identifier);
|
||||
net_warn_ratelimited("%s: Warning: Port %d (on %s) was related to aggregator %d but was not on its port list\n",
|
||||
port->slave->bond->dev->name,
|
||||
port->actor_port_number,
|
||||
port->slave->dev->name,
|
||||
port->aggregator->aggregator_identifier);
|
||||
}
|
||||
}
|
||||
/* search on all aggregators for a suitable aggregator for this port */
|
||||
@@ -1318,9 +1315,9 @@ static void ad_port_selection_logic(struct port *port)
|
||||
port->next_port_in_aggregator = aggregator->lag_ports;
|
||||
port->aggregator->num_of_ports++;
|
||||
aggregator->lag_ports = port;
|
||||
pr_debug("Port %d joined LAG %d(existing LAG)\n",
|
||||
port->actor_port_number,
|
||||
port->aggregator->aggregator_identifier);
|
||||
netdev_dbg(bond->dev, "Port %d joined LAG %d(existing LAG)\n",
|
||||
port->actor_port_number,
|
||||
port->aggregator->aggregator_identifier);
|
||||
|
||||
/* mark this port as selected */
|
||||
port->sm_vars |= AD_PORT_SELECTED;
|
||||
@@ -1363,12 +1360,11 @@ static void ad_port_selection_logic(struct port *port)
|
||||
/* mark this port as selected */
|
||||
port->sm_vars |= AD_PORT_SELECTED;
|
||||
|
||||
pr_debug("Port %d joined LAG %d(new LAG)\n",
|
||||
port->actor_port_number,
|
||||
port->aggregator->aggregator_identifier);
|
||||
netdev_dbg(bond->dev, "Port %d joined LAG %d(new LAG)\n",
|
||||
port->actor_port_number,
|
||||
port->aggregator->aggregator_identifier);
|
||||
} else {
|
||||
pr_err("%s: Port %d (on %s) did not find a suitable aggregator\n",
|
||||
port->slave->bond->dev->name,
|
||||
netdev_err(bond->dev, "Port %d (on %s) did not find a suitable aggregator\n",
|
||||
port->actor_port_number, port->slave->dev->name);
|
||||
}
|
||||
}
|
||||
@@ -1445,9 +1441,9 @@ static struct aggregator *ad_agg_selection_test(struct aggregator *best,
|
||||
break;
|
||||
|
||||
default:
|
||||
pr_warn_ratelimited("%s: Impossible agg select mode %d\n",
|
||||
curr->slave->bond->dev->name,
|
||||
__get_agg_selection_mode(curr->lag_ports));
|
||||
net_warn_ratelimited("%s: Impossible agg select mode %d\n",
|
||||
curr->slave->bond->dev->name,
|
||||
__get_agg_selection_mode(curr->lag_ports));
|
||||
break;
|
||||
}
|
||||
|
||||
@@ -1539,40 +1535,40 @@ static void ad_agg_selection_logic(struct aggregator *agg)
|
||||
|
||||
/* if there is new best aggregator, activate it */
|
||||
if (best) {
|
||||
pr_debug("best Agg=%d; P=%d; a k=%d; p k=%d; Ind=%d; Act=%d\n",
|
||||
best->aggregator_identifier, best->num_of_ports,
|
||||
best->actor_oper_aggregator_key,
|
||||
best->partner_oper_aggregator_key,
|
||||
best->is_individual, best->is_active);
|
||||
pr_debug("best ports %p slave %p %s\n",
|
||||
best->lag_ports, best->slave,
|
||||
best->slave ? best->slave->dev->name : "NULL");
|
||||
netdev_dbg(bond->dev, "best Agg=%d; P=%d; a k=%d; p k=%d; Ind=%d; Act=%d\n",
|
||||
best->aggregator_identifier, best->num_of_ports,
|
||||
best->actor_oper_aggregator_key,
|
||||
best->partner_oper_aggregator_key,
|
||||
best->is_individual, best->is_active);
|
||||
netdev_dbg(bond->dev, "best ports %p slave %p %s\n",
|
||||
best->lag_ports, best->slave,
|
||||
best->slave ? best->slave->dev->name : "NULL");
|
||||
|
||||
bond_for_each_slave_rcu(bond, slave, iter) {
|
||||
agg = &(SLAVE_AD_INFO(slave)->aggregator);
|
||||
|
||||
pr_debug("Agg=%d; P=%d; a k=%d; p k=%d; Ind=%d; Act=%d\n",
|
||||
agg->aggregator_identifier, agg->num_of_ports,
|
||||
agg->actor_oper_aggregator_key,
|
||||
agg->partner_oper_aggregator_key,
|
||||
agg->is_individual, agg->is_active);
|
||||
netdev_dbg(bond->dev, "Agg=%d; P=%d; a k=%d; p k=%d; Ind=%d; Act=%d\n",
|
||||
agg->aggregator_identifier, agg->num_of_ports,
|
||||
agg->actor_oper_aggregator_key,
|
||||
agg->partner_oper_aggregator_key,
|
||||
agg->is_individual, agg->is_active);
|
||||
}
|
||||
|
||||
/* check if any partner replys */
|
||||
if (best->is_individual) {
|
||||
pr_warn_ratelimited("%s: Warning: No 802.3ad response from the link partner for any adapters in the bond\n",
|
||||
best->slave ?
|
||||
best->slave->bond->dev->name : "NULL");
|
||||
net_warn_ratelimited("%s: Warning: No 802.3ad response from the link partner for any adapters in the bond\n",
|
||||
best->slave ?
|
||||
best->slave->bond->dev->name : "NULL");
|
||||
}
|
||||
|
||||
best->is_active = 1;
|
||||
pr_debug("LAG %d chosen as the active LAG\n",
|
||||
best->aggregator_identifier);
|
||||
pr_debug("Agg=%d; P=%d; a k=%d; p k=%d; Ind=%d; Act=%d\n",
|
||||
best->aggregator_identifier, best->num_of_ports,
|
||||
best->actor_oper_aggregator_key,
|
||||
best->partner_oper_aggregator_key,
|
||||
best->is_individual, best->is_active);
|
||||
netdev_dbg(bond->dev, "LAG %d chosen as the active LAG\n",
|
||||
best->aggregator_identifier);
|
||||
netdev_dbg(bond->dev, "Agg=%d; P=%d; a k=%d; p k=%d; Ind=%d; Act=%d\n",
|
||||
best->aggregator_identifier, best->num_of_ports,
|
||||
best->actor_oper_aggregator_key,
|
||||
best->partner_oper_aggregator_key,
|
||||
best->is_individual, best->is_active);
|
||||
|
||||
/* disable the ports that were related to the former
|
||||
* active_aggregator
|
||||
@@ -1908,13 +1904,13 @@ void bond_3ad_unbind_slave(struct slave *slave)
|
||||
|
||||
/* if slave is null, the whole port is not initialized */
|
||||
if (!port->slave) {
|
||||
pr_warn("Warning: %s: Trying to unbind an uninitialized port on %s\n",
|
||||
slave->bond->dev->name, slave->dev->name);
|
||||
netdev_warn(bond->dev, "Trying to unbind an uninitialized port on %s\n",
|
||||
slave->dev->name);
|
||||
return;
|
||||
}
|
||||
|
||||
pr_debug("Unbinding Link Aggregation Group %d\n",
|
||||
aggregator->aggregator_identifier);
|
||||
netdev_dbg(bond->dev, "Unbinding Link Aggregation Group %d\n",
|
||||
aggregator->aggregator_identifier);
|
||||
|
||||
/* Tell the partner that this port is not suitable for aggregation */
|
||||
port->actor_oper_port_state &= ~AD_STATE_AGGREGATION;
|
||||
@@ -1949,14 +1945,13 @@ void bond_3ad_unbind_slave(struct slave *slave)
|
||||
* new 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 - replacing with LAG %d\n",
|
||||
aggregator->aggregator_identifier,
|
||||
new_aggregator->aggregator_identifier);
|
||||
netdev_dbg(bond->dev, "Some port(s) related to LAG %d - replacing with LAG %d\n",
|
||||
aggregator->aggregator_identifier,
|
||||
new_aggregator->aggregator_identifier);
|
||||
|
||||
if ((new_aggregator->lag_ports == port) &&
|
||||
new_aggregator->is_active) {
|
||||
pr_info("%s: Removing an active aggregator\n",
|
||||
aggregator->slave->bond->dev->name);
|
||||
netdev_info(bond->dev, "Removing an active aggregator\n");
|
||||
select_new_active_agg = 1;
|
||||
}
|
||||
|
||||
@@ -1986,8 +1981,7 @@ void bond_3ad_unbind_slave(struct slave *slave)
|
||||
if (select_new_active_agg)
|
||||
ad_agg_selection_logic(__get_first_agg(port));
|
||||
} else {
|
||||
pr_warn("%s: Warning: unbinding aggregator, and could not find a new aggregator for its ports\n",
|
||||
slave->bond->dev->name);
|
||||
netdev_warn(bond->dev, "unbinding aggregator, and could not find a new aggregator for its ports\n");
|
||||
}
|
||||
} else {
|
||||
/* in case that the only port related to this
|
||||
@@ -1996,8 +1990,7 @@ void bond_3ad_unbind_slave(struct slave *slave)
|
||||
select_new_active_agg = aggregator->is_active;
|
||||
ad_clear_agg(aggregator);
|
||||
if (select_new_active_agg) {
|
||||
pr_info("%s: Removing an active aggregator\n",
|
||||
slave->bond->dev->name);
|
||||
netdev_info(bond->dev, "Removing an active aggregator\n");
|
||||
/* select new active aggregator */
|
||||
temp_aggregator = __get_first_agg(port);
|
||||
if (temp_aggregator)
|
||||
@@ -2006,7 +1999,7 @@ void bond_3ad_unbind_slave(struct slave *slave)
|
||||
}
|
||||
}
|
||||
|
||||
pr_debug("Unbinding port %d\n", port->actor_port_number);
|
||||
netdev_dbg(bond->dev, "Unbinding port %d\n", port->actor_port_number);
|
||||
|
||||
/* find the aggregator that this port is connected to */
|
||||
bond_for_each_slave(bond, slave_iter, iter) {
|
||||
@@ -2029,8 +2022,7 @@ void bond_3ad_unbind_slave(struct slave *slave)
|
||||
select_new_active_agg = temp_aggregator->is_active;
|
||||
ad_clear_agg(temp_aggregator);
|
||||
if (select_new_active_agg) {
|
||||
pr_info("%s: Removing an active aggregator\n",
|
||||
slave->bond->dev->name);
|
||||
netdev_info(bond->dev, "Removing an active aggregator\n");
|
||||
/* select new active aggregator */
|
||||
ad_agg_selection_logic(__get_first_agg(port));
|
||||
}
|
||||
@@ -2081,8 +2073,8 @@ void bond_3ad_state_machine_handler(struct work_struct *work)
|
||||
/* select the active aggregator for the bond */
|
||||
if (port) {
|
||||
if (!port->slave) {
|
||||
pr_warn_ratelimited("%s: Warning: bond's first port is uninitialized\n",
|
||||
bond->dev->name);
|
||||
net_warn_ratelimited("%s: Warning: bond's first port is uninitialized\n",
|
||||
bond->dev->name);
|
||||
goto re_arm;
|
||||
}
|
||||
|
||||
@@ -2096,7 +2088,7 @@ void bond_3ad_state_machine_handler(struct work_struct *work)
|
||||
bond_for_each_slave_rcu(bond, slave, iter) {
|
||||
port = &(SLAVE_AD_INFO(slave)->port);
|
||||
if (!port->slave) {
|
||||
pr_warn_ratelimited("%s: Warning: Found an uninitialized port\n",
|
||||
net_warn_ratelimited("%s: Warning: Found an uninitialized port\n",
|
||||
bond->dev->name);
|
||||
goto re_arm;
|
||||
}
|
||||
@@ -2158,16 +2150,16 @@ static int bond_3ad_rx_indication(struct lacpdu *lacpdu, struct slave *slave,
|
||||
port = &(SLAVE_AD_INFO(slave)->port);
|
||||
|
||||
if (!port->slave) {
|
||||
pr_warn_ratelimited("%s: Warning: port of slave %s is uninitialized\n",
|
||||
slave->dev->name, slave->bond->dev->name);
|
||||
net_warn_ratelimited("%s: Warning: port of slave %s is uninitialized\n",
|
||||
slave->dev->name, slave->bond->dev->name);
|
||||
return ret;
|
||||
}
|
||||
|
||||
switch (lacpdu->subtype) {
|
||||
case AD_TYPE_LACPDU:
|
||||
ret = RX_HANDLER_CONSUMED;
|
||||
pr_debug("Received LACPDU on port %d\n",
|
||||
port->actor_port_number);
|
||||
netdev_dbg(slave->bond->dev, "Received LACPDU on port %d\n",
|
||||
port->actor_port_number);
|
||||
/* Protect against concurrent state machines */
|
||||
__get_state_machine_lock(port);
|
||||
ad_rx_machine(lacpdu, port);
|
||||
@@ -2182,20 +2174,20 @@ static int bond_3ad_rx_indication(struct lacpdu *lacpdu, struct slave *slave,
|
||||
|
||||
switch (((struct bond_marker *)lacpdu)->tlv_type) {
|
||||
case AD_MARKER_INFORMATION_SUBTYPE:
|
||||
pr_debug("Received Marker Information on port %d\n",
|
||||
port->actor_port_number);
|
||||
netdev_dbg(slave->bond->dev, "Received Marker Information on port %d\n",
|
||||
port->actor_port_number);
|
||||
ad_marker_info_received((struct bond_marker *)lacpdu, port);
|
||||
break;
|
||||
|
||||
case AD_MARKER_RESPONSE_SUBTYPE:
|
||||
pr_debug("Received Marker Response on port %d\n",
|
||||
port->actor_port_number);
|
||||
netdev_dbg(slave->bond->dev, "Received Marker Response on port %d\n",
|
||||
port->actor_port_number);
|
||||
ad_marker_response_received((struct bond_marker *)lacpdu, port);
|
||||
break;
|
||||
|
||||
default:
|
||||
pr_debug("Received an unknown Marker subtype on slot %d\n",
|
||||
port->actor_port_number);
|
||||
netdev_dbg(slave->bond->dev, "Received an unknown Marker subtype on slot %d\n",
|
||||
port->actor_port_number);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -2216,8 +2208,8 @@ void bond_3ad_adapter_speed_changed(struct slave *slave)
|
||||
|
||||
/* if slave is null, the whole port is not initialized */
|
||||
if (!port->slave) {
|
||||
pr_warn("Warning: %s: speed changed for uninitialized port on %s\n",
|
||||
slave->bond->dev->name, slave->dev->name);
|
||||
netdev_warn(slave->bond->dev, "speed changed for uninitialized port on %s\n",
|
||||
slave->dev->name);
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -2226,7 +2218,7 @@ void bond_3ad_adapter_speed_changed(struct slave *slave)
|
||||
port->actor_admin_port_key &= ~AD_SPEED_KEY_BITS;
|
||||
port->actor_oper_port_key = port->actor_admin_port_key |=
|
||||
(__get_link_speed(port) << 1);
|
||||
pr_debug("Port %d changed speed\n", port->actor_port_number);
|
||||
netdev_dbg(slave->bond->dev, "Port %d changed speed\n", port->actor_port_number);
|
||||
/* there is no need to reselect a new aggregator, just signal the
|
||||
* state machines to reinitialize
|
||||
*/
|
||||
@@ -2249,8 +2241,8 @@ void bond_3ad_adapter_duplex_changed(struct slave *slave)
|
||||
|
||||
/* if slave is null, the whole port is not initialized */
|
||||
if (!port->slave) {
|
||||
pr_warn("%s: Warning: duplex changed for uninitialized port on %s\n",
|
||||
slave->bond->dev->name, slave->dev->name);
|
||||
netdev_warn(slave->bond->dev, "duplex changed for uninitialized port on %s\n",
|
||||
slave->dev->name);
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -2259,7 +2251,7 @@ void bond_3ad_adapter_duplex_changed(struct slave *slave)
|
||||
port->actor_admin_port_key &= ~AD_DUPLEX_KEY_BITS;
|
||||
port->actor_oper_port_key = port->actor_admin_port_key |=
|
||||
__get_duplex(port);
|
||||
pr_debug("Port %d changed duplex\n", port->actor_port_number);
|
||||
netdev_dbg(slave->bond->dev, "Port %d changed duplex\n", port->actor_port_number);
|
||||
/* there is no need to reselect a new aggregator, just signal the
|
||||
* state machines to reinitialize
|
||||
*/
|
||||
@@ -2283,8 +2275,8 @@ void bond_3ad_handle_link_change(struct slave *slave, char link)
|
||||
|
||||
/* if slave is null, the whole port is not initialized */
|
||||
if (!port->slave) {
|
||||
pr_warn("Warning: %s: link status changed for uninitialized port on %s\n",
|
||||
slave->bond->dev->name, slave->dev->name);
|
||||
netdev_warn(slave->bond->dev, "link status changed for uninitialized port on %s\n",
|
||||
slave->dev->name);
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -2311,9 +2303,9 @@ void bond_3ad_handle_link_change(struct slave *slave, char link)
|
||||
port->actor_oper_port_key = (port->actor_admin_port_key &=
|
||||
~AD_SPEED_KEY_BITS);
|
||||
}
|
||||
pr_debug("Port %d changed link status to %s\n",
|
||||
port->actor_port_number,
|
||||
link == BOND_LINK_UP ? "UP" : "DOWN");
|
||||
netdev_dbg(slave->bond->dev, "Port %d changed link status to %s\n",
|
||||
port->actor_port_number,
|
||||
link == BOND_LINK_UP ? "UP" : "DOWN");
|
||||
/* there is no need to reselect a new aggregator, just signal the
|
||||
* state machines to reinitialize
|
||||
*/
|
||||
@@ -2427,8 +2419,7 @@ int bond_3ad_xmit_xor(struct sk_buff *skb, struct net_device *dev)
|
||||
int agg_id;
|
||||
|
||||
if (__bond_3ad_get_active_agg_info(bond, &ad_info)) {
|
||||
pr_debug("%s: Error: __bond_3ad_get_active_agg_info failed\n",
|
||||
dev->name);
|
||||
netdev_dbg(dev, "__bond_3ad_get_active_agg_info failed\n");
|
||||
goto err_free;
|
||||
}
|
||||
|
||||
@@ -2436,7 +2427,7 @@ int bond_3ad_xmit_xor(struct sk_buff *skb, struct net_device *dev)
|
||||
agg_id = ad_info.aggregator_id;
|
||||
|
||||
if (slaves_in_agg == 0) {
|
||||
pr_debug("%s: Error: active aggregator is empty\n", dev->name);
|
||||
netdev_dbg(dev, "active aggregator is empty\n");
|
||||
goto err_free;
|
||||
}
|
||||
|
||||
@@ -2462,8 +2453,8 @@ int bond_3ad_xmit_xor(struct sk_buff *skb, struct net_device *dev)
|
||||
}
|
||||
|
||||
if (slave_agg_no >= 0) {
|
||||
pr_err("%s: Error: Couldn't find a slave to tx on for aggregator ID %d\n",
|
||||
dev->name, agg_id);
|
||||
netdev_err(dev, "Couldn't find a slave to tx on for aggregator ID %d\n",
|
||||
agg_id);
|
||||
goto err_free;
|
||||
}
|
||||
|
||||
|
||||
@@ -19,8 +19,6 @@
|
||||
*
|
||||
*/
|
||||
|
||||
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
|
||||
|
||||
#include <linux/skbuff.h>
|
||||
#include <linux/netdevice.h>
|
||||
#include <linux/etherdevice.h>
|
||||
@@ -369,7 +367,7 @@ static int rlb_arp_recv(const struct sk_buff *skb, struct bonding *bond,
|
||||
if (arp->op_code == htons(ARPOP_REPLY)) {
|
||||
/* update rx hash table for this ARP */
|
||||
rlb_update_entry_from_arp(bond, arp);
|
||||
pr_debug("Server received an ARP Reply from client\n");
|
||||
netdev_dbg(bond->dev, "Server received an ARP Reply from client\n");
|
||||
}
|
||||
out:
|
||||
return RX_HANDLER_ANOTHER;
|
||||
@@ -535,8 +533,8 @@ static void rlb_update_client(struct rlb_client_info *client_info)
|
||||
client_info->slave->dev->dev_addr,
|
||||
client_info->mac_dst);
|
||||
if (!skb) {
|
||||
pr_err("%s: Error: failed to create an ARP packet\n",
|
||||
client_info->slave->bond->dev->name);
|
||||
netdev_err(client_info->slave->bond->dev,
|
||||
"failed to create an ARP packet\n");
|
||||
continue;
|
||||
}
|
||||
|
||||
@@ -545,8 +543,8 @@ static void rlb_update_client(struct rlb_client_info *client_info)
|
||||
if (client_info->vlan_id) {
|
||||
skb = vlan_put_tag(skb, htons(ETH_P_8021Q), client_info->vlan_id);
|
||||
if (!skb) {
|
||||
pr_err("%s: Error: failed to insert VLAN tag\n",
|
||||
client_info->slave->bond->dev->name);
|
||||
netdev_err(client_info->slave->bond->dev,
|
||||
"failed to insert VLAN tag\n");
|
||||
continue;
|
||||
}
|
||||
}
|
||||
@@ -630,8 +628,7 @@ static void rlb_req_update_subnet_clients(struct bonding *bond, __be32 src_ip)
|
||||
client_info = &(bond_info->rx_hashtbl[hash_index]);
|
||||
|
||||
if (!client_info->slave) {
|
||||
pr_err("%s: Error: found a client with no channel in the client's hash table\n",
|
||||
bond->dev->name);
|
||||
netdev_err(bond->dev, "found a client with no channel in the client's hash table\n");
|
||||
continue;
|
||||
}
|
||||
/*update all clients using this src_ip, that are not assigned
|
||||
@@ -767,7 +764,7 @@ static struct slave *rlb_arp_xmit(struct sk_buff *skb, struct bonding *bond)
|
||||
tx_slave = rlb_choose_channel(skb, bond);
|
||||
if (tx_slave)
|
||||
ether_addr_copy(arp->mac_src, tx_slave->dev->dev_addr);
|
||||
pr_debug("Server sent ARP Reply packet\n");
|
||||
netdev_dbg(bond->dev, "Server sent ARP Reply packet\n");
|
||||
} else if (arp->op_code == htons(ARPOP_REQUEST)) {
|
||||
/* Create an entry in the rx_hashtbl for this client as a
|
||||
* place holder.
|
||||
@@ -787,7 +784,7 @@ static struct slave *rlb_arp_xmit(struct sk_buff *skb, struct bonding *bond)
|
||||
* updated with their assigned mac.
|
||||
*/
|
||||
rlb_req_update_subnet_clients(bond, arp->ip_src);
|
||||
pr_debug("Server sent ARP Request packet\n");
|
||||
netdev_dbg(bond->dev, "Server sent ARP Request packet\n");
|
||||
}
|
||||
|
||||
return tx_slave;
|
||||
@@ -1026,8 +1023,7 @@ static void alb_send_lp_vid(struct slave *slave, u8 mac_addr[],
|
||||
if (vid) {
|
||||
skb = vlan_put_tag(skb, vlan_proto, vid);
|
||||
if (!skb) {
|
||||
pr_err("%s: Error: failed to insert VLAN tag\n",
|
||||
slave->bond->dev->name);
|
||||
netdev_err(slave->bond->dev, "failed to insert VLAN tag\n");
|
||||
return;
|
||||
}
|
||||
}
|
||||
@@ -1093,9 +1089,8 @@ static int alb_set_slave_mac_addr(struct slave *slave, u8 addr[])
|
||||
memcpy(s_addr.sa_data, addr, dev->addr_len);
|
||||
s_addr.sa_family = dev->type;
|
||||
if (dev_set_mac_address(dev, &s_addr)) {
|
||||
pr_err("%s: Error: dev_set_mac_address of dev %s failed!\n"
|
||||
"ALB mode requires that the base driver support setting the hw address also when the network device's interface is open\n",
|
||||
slave->bond->dev->name, dev->name);
|
||||
netdev_err(slave->bond->dev, "dev_set_mac_address of dev %s failed! ALB mode requires that the base driver support setting the hw address also when the network device's interface is open\n",
|
||||
dev->name);
|
||||
return -EOPNOTSUPP;
|
||||
}
|
||||
return 0;
|
||||
@@ -1269,13 +1264,12 @@ static int alb_handle_addr_collision_on_attach(struct bonding *bond, struct slav
|
||||
if (free_mac_slave) {
|
||||
alb_set_slave_mac_addr(slave, free_mac_slave->perm_hwaddr);
|
||||
|
||||
pr_warn("%s: Warning: the hw address of slave %s is in use by the bond; giving it the hw address of %s\n",
|
||||
bond->dev->name, slave->dev->name,
|
||||
free_mac_slave->dev->name);
|
||||
netdev_warn(bond->dev, "the hw address of slave %s is in use by the bond; giving it the hw address of %s\n",
|
||||
slave->dev->name, free_mac_slave->dev->name);
|
||||
|
||||
} else if (has_bond_addr) {
|
||||
pr_err("%s: Error: the hw address of slave %s is in use by the bond; couldn't find a slave with a free hw address to give it (this should not have happened)\n",
|
||||
bond->dev->name, slave->dev->name);
|
||||
netdev_err(bond->dev, "the hw address of slave %s is in use by the bond; couldn't find a slave with a free hw address to give it (this should not have happened)\n",
|
||||
slave->dev->name);
|
||||
return -EFAULT;
|
||||
}
|
||||
|
||||
|
||||
@@ -69,8 +69,7 @@ void bond_debug_register(struct bonding *bond)
|
||||
debugfs_create_dir(bond->dev->name, bonding_debug_root);
|
||||
|
||||
if (!bond->debug_dir) {
|
||||
pr_warn("%s: Warning: failed to register to debugfs\n",
|
||||
bond->dev->name);
|
||||
netdev_warn(bond->dev, "failed to register to debugfs\n");
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -98,8 +97,7 @@ void bond_debug_reregister(struct bonding *bond)
|
||||
if (d) {
|
||||
bond->debug_dir = d;
|
||||
} else {
|
||||
pr_warn("%s: Warning: failed to reregister, so just unregister old one\n",
|
||||
bond->dev->name);
|
||||
netdev_warn(bond->dev, "failed to reregister, so just unregister old one\n");
|
||||
bond_debug_unregister(bond);
|
||||
}
|
||||
}
|
||||
|
||||
+162
-182
File diff suppressed because it is too large
Load Diff
@@ -9,8 +9,6 @@
|
||||
* (at your option) any later version.
|
||||
*/
|
||||
|
||||
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
|
||||
|
||||
#include <linux/module.h>
|
||||
#include <linux/errno.h>
|
||||
#include <linux/netdevice.h>
|
||||
@@ -181,8 +179,7 @@ static int bond_changelink(struct net_device *bond_dev,
|
||||
int arp_interval = nla_get_u32(data[IFLA_BOND_ARP_INTERVAL]);
|
||||
|
||||
if (arp_interval && miimon) {
|
||||
pr_err("%s: ARP monitoring cannot be used with MII monitoring\n",
|
||||
bond->dev->name);
|
||||
netdev_err(bond->dev, "ARP monitoring cannot be used with MII monitoring\n");
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
@@ -207,8 +204,7 @@ static int bond_changelink(struct net_device *bond_dev,
|
||||
i++;
|
||||
}
|
||||
if (i == 0 && bond->params.arp_interval)
|
||||
pr_warn("%s: Removing last arp target with arp_interval on\n",
|
||||
bond->dev->name);
|
||||
netdev_warn(bond->dev, "Removing last arp target with arp_interval on\n");
|
||||
if (err)
|
||||
return err;
|
||||
}
|
||||
@@ -216,8 +212,7 @@ static int bond_changelink(struct net_device *bond_dev,
|
||||
int arp_validate = nla_get_u32(data[IFLA_BOND_ARP_VALIDATE]);
|
||||
|
||||
if (arp_validate && miimon) {
|
||||
pr_err("%s: ARP validating cannot be used with MII monitoring\n",
|
||||
bond->dev->name);
|
||||
netdev_err(bond->dev, "ARP validating cannot be used with MII monitoring\n");
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
|
||||
+101
-117
@@ -9,8 +9,6 @@
|
||||
* (at your option) any later version.
|
||||
*/
|
||||
|
||||
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
|
||||
|
||||
#include <linux/errno.h>
|
||||
#include <linux/if.h>
|
||||
#include <linux/netdevice.h>
|
||||
@@ -544,9 +542,8 @@ static void bond_opt_dep_print(struct bonding *bond,
|
||||
params = &bond->params;
|
||||
modeval = bond_opt_get_val(BOND_OPT_MODE, params->mode);
|
||||
if (test_bit(params->mode, &opt->unsuppmodes))
|
||||
pr_err("%s: option %s: mode dependency failed, not supported in mode %s(%llu)\n",
|
||||
bond->dev->name, opt->name,
|
||||
modeval->string, modeval->value);
|
||||
netdev_err(bond->dev, "option %s: mode dependency failed, not supported in mode %s(%llu)\n",
|
||||
opt->name, modeval->string, modeval->value);
|
||||
}
|
||||
|
||||
static void bond_opt_error_interpret(struct bonding *bond,
|
||||
@@ -564,31 +561,30 @@ static void bond_opt_error_interpret(struct bonding *bond,
|
||||
p = strchr(val->string, '\n');
|
||||
if (p)
|
||||
*p = '\0';
|
||||
pr_err("%s: option %s: invalid value (%s)\n",
|
||||
bond->dev->name, opt->name, val->string);
|
||||
netdev_err(bond->dev, "option %s: invalid value (%s)\n",
|
||||
opt->name, val->string);
|
||||
} else {
|
||||
pr_err("%s: option %s: invalid value (%llu)\n",
|
||||
bond->dev->name, opt->name, val->value);
|
||||
netdev_err(bond->dev, "option %s: invalid value (%llu)\n",
|
||||
opt->name, val->value);
|
||||
}
|
||||
}
|
||||
minval = bond_opt_get_flags(opt, BOND_VALFLAG_MIN);
|
||||
maxval = bond_opt_get_flags(opt, BOND_VALFLAG_MAX);
|
||||
if (!maxval)
|
||||
break;
|
||||
pr_err("%s: option %s: allowed values %llu - %llu\n",
|
||||
bond->dev->name, opt->name, minval ? minval->value : 0,
|
||||
maxval->value);
|
||||
netdev_err(bond->dev, "option %s: allowed values %llu - %llu\n",
|
||||
opt->name, minval ? minval->value : 0, maxval->value);
|
||||
break;
|
||||
case -EACCES:
|
||||
bond_opt_dep_print(bond, opt);
|
||||
break;
|
||||
case -ENOTEMPTY:
|
||||
pr_err("%s: option %s: unable to set because the bond device has slaves\n",
|
||||
bond->dev->name, opt->name);
|
||||
netdev_err(bond->dev, "option %s: unable to set because the bond device has slaves\n",
|
||||
opt->name);
|
||||
break;
|
||||
case -EBUSY:
|
||||
pr_err("%s: option %s: unable to set because the bond device is up\n",
|
||||
bond->dev->name, opt->name);
|
||||
netdev_err(bond->dev, "option %s: unable to set because the bond device is up\n",
|
||||
opt->name);
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
@@ -675,14 +671,14 @@ static int bond_option_mode_set(struct bonding *bond,
|
||||
const struct bond_opt_value *newval)
|
||||
{
|
||||
if (!bond_mode_uses_arp(newval->value) && bond->params.arp_interval) {
|
||||
pr_info("%s: %s mode is incompatible with arp monitoring, start mii monitoring\n",
|
||||
bond->dev->name, newval->string);
|
||||
netdev_info(bond->dev, "%s mode is incompatible with arp monitoring, start mii monitoring\n",
|
||||
newval->string);
|
||||
/* disable arp monitoring */
|
||||
bond->params.arp_interval = 0;
|
||||
/* set miimon to default value */
|
||||
bond->params.miimon = BOND_DEFAULT_MIIMON;
|
||||
pr_info("%s: Setting MII monitoring interval to %d\n",
|
||||
bond->dev->name, bond->params.miimon);
|
||||
netdev_info(bond->dev, "Setting MII monitoring interval to %d\n",
|
||||
bond->params.miimon);
|
||||
}
|
||||
|
||||
/* don't cache arp_validate between modes */
|
||||
@@ -723,14 +719,14 @@ static int bond_option_active_slave_set(struct bonding *bond,
|
||||
|
||||
if (slave_dev) {
|
||||
if (!netif_is_bond_slave(slave_dev)) {
|
||||
pr_err("Device %s is not bonding slave\n",
|
||||
slave_dev->name);
|
||||
netdev_err(bond->dev, "Device %s is not bonding slave\n",
|
||||
slave_dev->name);
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
if (bond->dev != netdev_master_upper_dev_get(slave_dev)) {
|
||||
pr_err("%s: Device %s is not our slave\n",
|
||||
bond->dev->name, slave_dev->name);
|
||||
netdev_err(bond->dev, "Device %s is not our slave\n",
|
||||
slave_dev->name);
|
||||
return -EINVAL;
|
||||
}
|
||||
}
|
||||
@@ -740,7 +736,7 @@ static int bond_option_active_slave_set(struct bonding *bond,
|
||||
|
||||
/* check to see if we are clearing active */
|
||||
if (!slave_dev) {
|
||||
pr_info("%s: Clearing current active slave\n", bond->dev->name);
|
||||
netdev_info(bond->dev, "Clearing current active slave\n");
|
||||
RCU_INIT_POINTER(bond->curr_active_slave, NULL);
|
||||
bond_select_active_slave(bond);
|
||||
} else {
|
||||
@@ -751,18 +747,18 @@ static int bond_option_active_slave_set(struct bonding *bond,
|
||||
|
||||
if (new_active == old_active) {
|
||||
/* do nothing */
|
||||
pr_info("%s: %s is already the current active slave\n",
|
||||
bond->dev->name, new_active->dev->name);
|
||||
netdev_info(bond->dev, "%s is already the current active slave\n",
|
||||
new_active->dev->name);
|
||||
} else {
|
||||
if (old_active && (new_active->link == BOND_LINK_UP) &&
|
||||
bond_slave_is_up(new_active)) {
|
||||
pr_info("%s: Setting %s as active slave\n",
|
||||
bond->dev->name, new_active->dev->name);
|
||||
netdev_info(bond->dev, "Setting %s as active slave\n",
|
||||
new_active->dev->name);
|
||||
bond_change_active_slave(bond, new_active);
|
||||
} else {
|
||||
pr_err("%s: Could not set %s as active slave; either %s is down or the link is down\n",
|
||||
bond->dev->name, new_active->dev->name,
|
||||
new_active->dev->name);
|
||||
netdev_err(bond->dev, "Could not set %s as active slave; either %s is down or the link is down\n",
|
||||
new_active->dev->name,
|
||||
new_active->dev->name);
|
||||
ret = -EINVAL;
|
||||
}
|
||||
}
|
||||
@@ -781,20 +777,17 @@ static int bond_option_active_slave_set(struct bonding *bond,
|
||||
static int bond_option_miimon_set(struct bonding *bond,
|
||||
const struct bond_opt_value *newval)
|
||||
{
|
||||
pr_info("%s: Setting MII monitoring interval to %llu\n",
|
||||
bond->dev->name, newval->value);
|
||||
netdev_info(bond->dev, "Setting MII monitoring interval to %llu\n",
|
||||
newval->value);
|
||||
bond->params.miimon = newval->value;
|
||||
if (bond->params.updelay)
|
||||
pr_info("%s: Note: Updating updelay (to %d) since it is a multiple of the miimon value\n",
|
||||
bond->dev->name,
|
||||
netdev_info(bond->dev, "Note: Updating updelay (to %d) since it is a multiple of the miimon value\n",
|
||||
bond->params.updelay * bond->params.miimon);
|
||||
if (bond->params.downdelay)
|
||||
pr_info("%s: Note: Updating downdelay (to %d) since it is a multiple of the miimon value\n",
|
||||
bond->dev->name,
|
||||
bond->params.downdelay * bond->params.miimon);
|
||||
netdev_info(bond->dev, "Note: Updating downdelay (to %d) since it is a multiple of the miimon value\n",
|
||||
bond->params.downdelay * bond->params.miimon);
|
||||
if (newval->value && bond->params.arp_interval) {
|
||||
pr_info("%s: MII monitoring cannot be used with ARP monitoring - disabling ARP monitoring...\n",
|
||||
bond->dev->name);
|
||||
netdev_info(bond->dev, "MII monitoring cannot be used with ARP monitoring - disabling ARP monitoring...\n");
|
||||
bond->params.arp_interval = 0;
|
||||
if (bond->params.arp_validate)
|
||||
bond->params.arp_validate = BOND_ARP_VALIDATE_NONE;
|
||||
@@ -826,20 +819,18 @@ static int bond_option_updelay_set(struct bonding *bond,
|
||||
int value = newval->value;
|
||||
|
||||
if (!bond->params.miimon) {
|
||||
pr_err("%s: Unable to set up delay as MII monitoring is disabled\n",
|
||||
bond->dev->name);
|
||||
netdev_err(bond->dev, "Unable to set up delay as MII monitoring is disabled\n");
|
||||
return -EPERM;
|
||||
}
|
||||
if ((value % bond->params.miimon) != 0) {
|
||||
pr_warn("%s: Warning: up delay (%d) is not a multiple of miimon (%d), updelay rounded to %d ms\n",
|
||||
bond->dev->name, value,
|
||||
bond->params.miimon,
|
||||
(value / bond->params.miimon) *
|
||||
bond->params.miimon);
|
||||
netdev_warn(bond->dev, "up delay (%d) is not a multiple of miimon (%d), updelay rounded to %d ms\n",
|
||||
value, bond->params.miimon,
|
||||
(value / bond->params.miimon) *
|
||||
bond->params.miimon);
|
||||
}
|
||||
bond->params.updelay = value / bond->params.miimon;
|
||||
pr_info("%s: Setting up delay to %d\n",
|
||||
bond->dev->name, bond->params.updelay * bond->params.miimon);
|
||||
netdev_info(bond->dev, "Setting up delay to %d\n",
|
||||
bond->params.updelay * bond->params.miimon);
|
||||
|
||||
return 0;
|
||||
}
|
||||
@@ -850,20 +841,18 @@ static int bond_option_downdelay_set(struct bonding *bond,
|
||||
int value = newval->value;
|
||||
|
||||
if (!bond->params.miimon) {
|
||||
pr_err("%s: Unable to set down delay as MII monitoring is disabled\n",
|
||||
bond->dev->name);
|
||||
netdev_err(bond->dev, "Unable to set down delay as MII monitoring is disabled\n");
|
||||
return -EPERM;
|
||||
}
|
||||
if ((value % bond->params.miimon) != 0) {
|
||||
pr_warn("%s: Warning: down delay (%d) is not a multiple of miimon (%d), delay rounded to %d ms\n",
|
||||
bond->dev->name, value,
|
||||
bond->params.miimon,
|
||||
(value / bond->params.miimon) *
|
||||
bond->params.miimon);
|
||||
netdev_warn(bond->dev, "down delay (%d) is not a multiple of miimon (%d), delay rounded to %d ms\n",
|
||||
value, bond->params.miimon,
|
||||
(value / bond->params.miimon) *
|
||||
bond->params.miimon);
|
||||
}
|
||||
bond->params.downdelay = value / bond->params.miimon;
|
||||
pr_info("%s: Setting down delay to %d\n",
|
||||
bond->dev->name, bond->params.downdelay * bond->params.miimon);
|
||||
netdev_info(bond->dev, "Setting down delay to %d\n",
|
||||
bond->params.downdelay * bond->params.miimon);
|
||||
|
||||
return 0;
|
||||
}
|
||||
@@ -871,8 +860,8 @@ static int bond_option_downdelay_set(struct bonding *bond,
|
||||
static int bond_option_use_carrier_set(struct bonding *bond,
|
||||
const struct bond_opt_value *newval)
|
||||
{
|
||||
pr_info("%s: Setting use_carrier to %llu\n",
|
||||
bond->dev->name, newval->value);
|
||||
netdev_info(bond->dev, "Setting use_carrier to %llu\n",
|
||||
newval->value);
|
||||
bond->params.use_carrier = newval->value;
|
||||
|
||||
return 0;
|
||||
@@ -885,18 +874,16 @@ static int bond_option_use_carrier_set(struct bonding *bond,
|
||||
static int bond_option_arp_interval_set(struct bonding *bond,
|
||||
const struct bond_opt_value *newval)
|
||||
{
|
||||
pr_info("%s: Setting ARP monitoring interval to %llu\n",
|
||||
bond->dev->name, newval->value);
|
||||
netdev_info(bond->dev, "Setting ARP monitoring interval to %llu\n",
|
||||
newval->value);
|
||||
bond->params.arp_interval = newval->value;
|
||||
if (newval->value) {
|
||||
if (bond->params.miimon) {
|
||||
pr_info("%s: ARP monitoring cannot be used with MII monitoring. %s Disabling MII monitoring\n",
|
||||
bond->dev->name, bond->dev->name);
|
||||
netdev_info(bond->dev, "ARP monitoring cannot be used with MII monitoring. Disabling MII monitoring\n");
|
||||
bond->params.miimon = 0;
|
||||
}
|
||||
if (!bond->params.arp_targets[0])
|
||||
pr_info("%s: ARP monitoring has been set up, but no ARP targets have been specified\n",
|
||||
bond->dev->name);
|
||||
netdev_info(bond->dev, "ARP monitoring has been set up, but no ARP targets have been specified\n");
|
||||
}
|
||||
if (bond->dev->flags & IFF_UP) {
|
||||
/* If the interface is up, we may need to fire off
|
||||
@@ -940,24 +927,24 @@ static int _bond_option_arp_ip_target_add(struct bonding *bond, __be32 target)
|
||||
int ind;
|
||||
|
||||
if (!bond_is_ip_target_ok(target)) {
|
||||
pr_err("%s: invalid ARP target %pI4 specified for addition\n",
|
||||
bond->dev->name, &target);
|
||||
netdev_err(bond->dev, "invalid ARP target %pI4 specified for addition\n",
|
||||
&target);
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
if (bond_get_targets_ip(targets, target) != -1) { /* dup */
|
||||
pr_err("%s: ARP target %pI4 is already present\n",
|
||||
bond->dev->name, &target);
|
||||
netdev_err(bond->dev, "ARP target %pI4 is already present\n",
|
||||
&target);
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
ind = bond_get_targets_ip(targets, 0); /* first free slot */
|
||||
if (ind == -1) {
|
||||
pr_err("%s: ARP target table is full!\n", bond->dev->name);
|
||||
netdev_err(bond->dev, "ARP target table is full!\n");
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
pr_info("%s: Adding ARP target %pI4\n", bond->dev->name, &target);
|
||||
netdev_info(bond->dev, "Adding ARP target %pI4\n", &target);
|
||||
|
||||
_bond_options_arp_ip_target_set(bond, ind, target, jiffies);
|
||||
|
||||
@@ -985,23 +972,22 @@ static int bond_option_arp_ip_target_rem(struct bonding *bond, __be32 target)
|
||||
int ind, i;
|
||||
|
||||
if (!bond_is_ip_target_ok(target)) {
|
||||
pr_err("%s: invalid ARP target %pI4 specified for removal\n",
|
||||
bond->dev->name, &target);
|
||||
netdev_err(bond->dev, "invalid ARP target %pI4 specified for removal\n",
|
||||
&target);
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
ind = bond_get_targets_ip(targets, target);
|
||||
if (ind == -1) {
|
||||
pr_err("%s: unable to remove nonexistent ARP target %pI4\n",
|
||||
bond->dev->name, &target);
|
||||
netdev_err(bond->dev, "unable to remove nonexistent ARP target %pI4\n",
|
||||
&target);
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
if (ind == 0 && !targets[1] && bond->params.arp_interval)
|
||||
pr_warn("%s: Removing last arp target with arp_interval on\n",
|
||||
bond->dev->name);
|
||||
netdev_warn(bond->dev, "Removing last arp target with arp_interval on\n");
|
||||
|
||||
pr_info("%s: Removing ARP target %pI4\n", bond->dev->name, &target);
|
||||
netdev_info(bond->dev, "Removing ARP target %pI4\n", &target);
|
||||
|
||||
/* not to race with bond_arp_rcv */
|
||||
write_lock_bh(&bond->lock);
|
||||
@@ -1040,8 +1026,8 @@ static int bond_option_arp_ip_targets_set(struct bonding *bond,
|
||||
|
||||
if (newval->string) {
|
||||
if (!in4_pton(newval->string+1, -1, (u8 *)&target, -1, NULL)) {
|
||||
pr_err("%s: invalid ARP target %pI4 specified\n",
|
||||
bond->dev->name, &target);
|
||||
netdev_err(bond->dev, "invalid ARP target %pI4 specified\n",
|
||||
&target);
|
||||
return ret;
|
||||
}
|
||||
if (newval->string[0] == '+')
|
||||
@@ -1049,8 +1035,7 @@ static int bond_option_arp_ip_targets_set(struct bonding *bond,
|
||||
else if (newval->string[0] == '-')
|
||||
ret = bond_option_arp_ip_target_rem(bond, target);
|
||||
else
|
||||
pr_err("no command found in arp_ip_targets file for bond %s - use +<addr> or -<addr>\n",
|
||||
bond->dev->name);
|
||||
netdev_err(bond->dev, "no command found in arp_ip_targets file - use +<addr> or -<addr>\n");
|
||||
} else {
|
||||
target = newval->value;
|
||||
ret = bond_option_arp_ip_target_add(bond, target);
|
||||
@@ -1062,8 +1047,8 @@ static int bond_option_arp_ip_targets_set(struct bonding *bond,
|
||||
static int bond_option_arp_validate_set(struct bonding *bond,
|
||||
const struct bond_opt_value *newval)
|
||||
{
|
||||
pr_info("%s: Setting arp_validate to %s (%llu)\n",
|
||||
bond->dev->name, newval->string, newval->value);
|
||||
netdev_info(bond->dev, "Setting arp_validate to %s (%llu)\n",
|
||||
newval->string, newval->value);
|
||||
|
||||
if (bond->dev->flags & IFF_UP) {
|
||||
if (!newval->value)
|
||||
@@ -1079,8 +1064,8 @@ static int bond_option_arp_validate_set(struct bonding *bond,
|
||||
static int bond_option_arp_all_targets_set(struct bonding *bond,
|
||||
const struct bond_opt_value *newval)
|
||||
{
|
||||
pr_info("%s: Setting arp_all_targets to %s (%llu)\n",
|
||||
bond->dev->name, newval->string, newval->value);
|
||||
netdev_info(bond->dev, "Setting arp_all_targets to %s (%llu)\n",
|
||||
newval->string, newval->value);
|
||||
bond->params.arp_all_targets = newval->value;
|
||||
|
||||
return 0;
|
||||
@@ -1102,7 +1087,7 @@ static int bond_option_primary_set(struct bonding *bond,
|
||||
*p = '\0';
|
||||
/* check to see if we are clearing primary */
|
||||
if (!strlen(primary)) {
|
||||
pr_info("%s: Setting primary slave to None\n", bond->dev->name);
|
||||
netdev_info(bond->dev, "Setting primary slave to None\n");
|
||||
bond->primary_slave = NULL;
|
||||
memset(bond->params.primary, 0, sizeof(bond->params.primary));
|
||||
bond_select_active_slave(bond);
|
||||
@@ -1111,8 +1096,8 @@ static int bond_option_primary_set(struct bonding *bond,
|
||||
|
||||
bond_for_each_slave(bond, slave, iter) {
|
||||
if (strncmp(slave->dev->name, primary, IFNAMSIZ) == 0) {
|
||||
pr_info("%s: Setting %s as primary slave\n",
|
||||
bond->dev->name, slave->dev->name);
|
||||
netdev_info(bond->dev, "Setting %s as primary slave\n",
|
||||
slave->dev->name);
|
||||
bond->primary_slave = slave;
|
||||
strcpy(bond->params.primary, slave->dev->name);
|
||||
bond_select_active_slave(bond);
|
||||
@@ -1121,15 +1106,15 @@ static int bond_option_primary_set(struct bonding *bond,
|
||||
}
|
||||
|
||||
if (bond->primary_slave) {
|
||||
pr_info("%s: Setting primary slave to None\n", bond->dev->name);
|
||||
netdev_info(bond->dev, "Setting primary slave to None\n");
|
||||
bond->primary_slave = NULL;
|
||||
bond_select_active_slave(bond);
|
||||
}
|
||||
strncpy(bond->params.primary, primary, IFNAMSIZ);
|
||||
bond->params.primary[IFNAMSIZ - 1] = 0;
|
||||
|
||||
pr_info("%s: Recording %s as primary, but it has not been enslaved to %s yet\n",
|
||||
bond->dev->name, primary, bond->dev->name);
|
||||
netdev_info(bond->dev, "Recording %s as primary, but it has not been enslaved to %s yet\n",
|
||||
primary, bond->dev->name);
|
||||
|
||||
out:
|
||||
write_unlock_bh(&bond->curr_slave_lock);
|
||||
@@ -1142,8 +1127,8 @@ out:
|
||||
static int bond_option_primary_reselect_set(struct bonding *bond,
|
||||
const struct bond_opt_value *newval)
|
||||
{
|
||||
pr_info("%s: Setting primary_reselect to %s (%llu)\n",
|
||||
bond->dev->name, newval->string, newval->value);
|
||||
netdev_info(bond->dev, "Setting primary_reselect to %s (%llu)\n",
|
||||
newval->string, newval->value);
|
||||
bond->params.primary_reselect = newval->value;
|
||||
|
||||
block_netpoll_tx();
|
||||
@@ -1158,8 +1143,8 @@ static int bond_option_primary_reselect_set(struct bonding *bond,
|
||||
static int bond_option_fail_over_mac_set(struct bonding *bond,
|
||||
const struct bond_opt_value *newval)
|
||||
{
|
||||
pr_info("%s: Setting fail_over_mac to %s (%llu)\n",
|
||||
bond->dev->name, newval->string, newval->value);
|
||||
netdev_info(bond->dev, "Setting fail_over_mac to %s (%llu)\n",
|
||||
newval->string, newval->value);
|
||||
bond->params.fail_over_mac = newval->value;
|
||||
|
||||
return 0;
|
||||
@@ -1168,8 +1153,8 @@ static int bond_option_fail_over_mac_set(struct bonding *bond,
|
||||
static int bond_option_xmit_hash_policy_set(struct bonding *bond,
|
||||
const struct bond_opt_value *newval)
|
||||
{
|
||||
pr_info("%s: Setting xmit hash policy to %s (%llu)\n",
|
||||
bond->dev->name, newval->string, newval->value);
|
||||
netdev_info(bond->dev, "Setting xmit hash policy to %s (%llu)\n",
|
||||
newval->string, newval->value);
|
||||
bond->params.xmit_policy = newval->value;
|
||||
|
||||
return 0;
|
||||
@@ -1178,8 +1163,8 @@ static int bond_option_xmit_hash_policy_set(struct bonding *bond,
|
||||
static int bond_option_resend_igmp_set(struct bonding *bond,
|
||||
const struct bond_opt_value *newval)
|
||||
{
|
||||
pr_info("%s: Setting resend_igmp to %llu\n",
|
||||
bond->dev->name, newval->value);
|
||||
netdev_info(bond->dev, "Setting resend_igmp to %llu\n",
|
||||
newval->value);
|
||||
bond->params.resend_igmp = newval->value;
|
||||
|
||||
return 0;
|
||||
@@ -1217,8 +1202,8 @@ static int bond_option_all_slaves_active_set(struct bonding *bond,
|
||||
static int bond_option_min_links_set(struct bonding *bond,
|
||||
const struct bond_opt_value *newval)
|
||||
{
|
||||
pr_info("%s: Setting min links value to %llu\n",
|
||||
bond->dev->name, newval->value);
|
||||
netdev_info(bond->dev, "Setting min links value to %llu\n",
|
||||
newval->value);
|
||||
bond->params.min_links = newval->value;
|
||||
|
||||
return 0;
|
||||
@@ -1253,8 +1238,8 @@ static int bond_option_pps_set(struct bonding *bond,
|
||||
static int bond_option_lacp_rate_set(struct bonding *bond,
|
||||
const struct bond_opt_value *newval)
|
||||
{
|
||||
pr_info("%s: Setting LACP rate to %s (%llu)\n",
|
||||
bond->dev->name, newval->string, newval->value);
|
||||
netdev_info(bond->dev, "Setting LACP rate to %s (%llu)\n",
|
||||
newval->string, newval->value);
|
||||
bond->params.lacp_fast = newval->value;
|
||||
bond_3ad_update_lacp_rate(bond);
|
||||
|
||||
@@ -1264,8 +1249,8 @@ static int bond_option_lacp_rate_set(struct bonding *bond,
|
||||
static int bond_option_ad_select_set(struct bonding *bond,
|
||||
const struct bond_opt_value *newval)
|
||||
{
|
||||
pr_info("%s: Setting ad_select to %s (%llu)\n",
|
||||
bond->dev->name, newval->string, newval->value);
|
||||
netdev_info(bond->dev, "Setting ad_select to %s (%llu)\n",
|
||||
newval->string, newval->value);
|
||||
bond->params.ad_select = newval->value;
|
||||
|
||||
return 0;
|
||||
@@ -1326,7 +1311,7 @@ out:
|
||||
return ret;
|
||||
|
||||
err_no_cmd:
|
||||
pr_info("invalid input for queue_id set for %s\n", bond->dev->name);
|
||||
netdev_info(bond->dev, "invalid input for queue_id set\n");
|
||||
ret = -EPERM;
|
||||
goto out;
|
||||
|
||||
@@ -1348,20 +1333,20 @@ static int bond_option_slaves_set(struct bonding *bond,
|
||||
|
||||
dev = __dev_get_by_name(dev_net(bond->dev), ifname);
|
||||
if (!dev) {
|
||||
pr_info("%s: interface %s does not exist!\n",
|
||||
bond->dev->name, ifname);
|
||||
netdev_info(bond->dev, "interface %s does not exist!\n",
|
||||
ifname);
|
||||
ret = -ENODEV;
|
||||
goto out;
|
||||
}
|
||||
|
||||
switch (command[0]) {
|
||||
case '+':
|
||||
pr_info("%s: Adding slave %s\n", bond->dev->name, dev->name);
|
||||
netdev_info(bond->dev, "Adding slave %s\n", dev->name);
|
||||
ret = bond_enslave(bond->dev, dev);
|
||||
break;
|
||||
|
||||
case '-':
|
||||
pr_info("%s: Removing slave %s\n", bond->dev->name, dev->name);
|
||||
netdev_info(bond->dev, "Removing slave %s\n", dev->name);
|
||||
ret = bond_release(bond->dev, dev);
|
||||
break;
|
||||
|
||||
@@ -1373,8 +1358,7 @@ out:
|
||||
return ret;
|
||||
|
||||
err_no_cmd:
|
||||
pr_err("no command found in slaves file for bond %s - use +ifname or -ifname\n",
|
||||
bond->dev->name);
|
||||
netdev_err(bond->dev, "no command found in slaves file - use +ifname or -ifname\n");
|
||||
ret = -EPERM;
|
||||
goto out;
|
||||
}
|
||||
@@ -1382,8 +1366,8 @@ err_no_cmd:
|
||||
static int bond_option_tlb_dynamic_lb_set(struct bonding *bond,
|
||||
const struct bond_opt_value *newval)
|
||||
{
|
||||
pr_info("%s: Setting dynamic-lb to %s (%llu)\n",
|
||||
bond->dev->name, newval->string, newval->value);
|
||||
netdev_info(bond->dev, "Setting dynamic-lb to %s (%llu)\n",
|
||||
newval->string, newval->value);
|
||||
bond->params.tlb_dynamic_lb = newval->value;
|
||||
|
||||
return 0;
|
||||
|
||||
@@ -252,8 +252,8 @@ void bond_create_proc_entry(struct bonding *bond)
|
||||
S_IRUGO, bn->proc_dir,
|
||||
&bond_info_fops, bond);
|
||||
if (bond->proc_entry == NULL)
|
||||
pr_warn("Warning: Cannot create /proc/net/%s/%s\n",
|
||||
DRV_NAME, bond_dev->name);
|
||||
netdev_warn(bond_dev, "Cannot create /proc/net/%s/%s\n",
|
||||
DRV_NAME, bond_dev->name);
|
||||
else
|
||||
memcpy(bond->proc_file_name, bond_dev->name, IFNAMSIZ);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user