drivers/net/bonding/: : use pr_fmt
Add #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt Remove DRV_NAME from pr_<level>s Consolidate long format strings Remove some extra tab indents Remove some unnecessary ()s from pr_<level>s arguments Align pr_<level> arguments Signed-off-by: Joe Perches <joe@perches.com> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
parent
231d52a7be
commit
a4aee5c808
|
@ -20,6 +20,8 @@
|
|||
*
|
||||
*/
|
||||
|
||||
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
|
||||
|
||||
#include <linux/skbuff.h>
|
||||
#include <linux/if_ether.h>
|
||||
#include <linux/netdevice.h>
|
||||
|
@ -352,7 +354,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);
|
||||
pr_debug("Port %d Received link speed %d update from adapter\n",
|
||||
port->actor_port_number, speed);
|
||||
return speed;
|
||||
}
|
||||
|
||||
|
@ -378,12 +381,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);
|
||||
pr_debug("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);
|
||||
pr_debug("Port %d Received status NOT full duplex update from adapter\n",
|
||||
port->actor_port_number);
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
@ -980,7 +985,9 @@ static void ad_mux_machine(struct port *port)
|
|||
|
||||
// check if the state machine was changed
|
||||
if (port->sm_mux_state != last_state) {
|
||||
pr_debug("Mux Machine: Port=%d, Last State=%d, Curr State=%d\n", port->actor_port_number, last_state, port->sm_mux_state);
|
||||
pr_debug("Mux Machine: Port=%d, Last State=%d, Curr State=%d\n",
|
||||
port->actor_port_number, last_state,
|
||||
port->sm_mux_state);
|
||||
switch (port->sm_mux_state) {
|
||||
case AD_MUX_DETACHED:
|
||||
__detach_bond_from_agg(port);
|
||||
|
@ -1079,7 +1086,9 @@ static void ad_rx_machine(struct lacpdu *lacpdu, struct port *port)
|
|||
|
||||
// check if the State machine was changed or new lacpdu arrived
|
||||
if ((port->sm_rx_state != last_state) || (lacpdu)) {
|
||||
pr_debug("Rx Machine: Port=%d, Last State=%d, Curr State=%d\n", port->actor_port_number, last_state, port->sm_rx_state);
|
||||
pr_debug("Rx Machine: Port=%d, Last State=%d, Curr State=%d\n",
|
||||
port->actor_port_number, last_state,
|
||||
port->sm_rx_state);
|
||||
switch (port->sm_rx_state) {
|
||||
case AD_RX_INITIALIZE:
|
||||
if (!(port->actor_oper_port_key & AD_DUPLEX_KEY_BITS)) {
|
||||
|
@ -1126,9 +1135,8 @@ static void ad_rx_machine(struct lacpdu *lacpdu, struct port *port)
|
|||
// detect loopback situation
|
||||
if (!MAC_ADDRESS_COMPARE(&(lacpdu->actor_system), &(port->actor_system))) {
|
||||
// INFO_RECEIVED_LOOPBACK_FRAMES
|
||||
pr_err(DRV_NAME ": %s: An illegal loopback occurred on "
|
||||
"adapter (%s). Check 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->dev->master->name, port->slave->dev->name);
|
||||
__release_rx_machine_lock(port);
|
||||
return;
|
||||
|
@ -1166,7 +1174,8 @@ static void ad_tx_machine(struct port *port)
|
|||
__update_lacpdu_from_port(port);
|
||||
|
||||
if (ad_lacpdu_send(port) >= 0) {
|
||||
pr_debug("Sent LACPDU on port %d\n", port->actor_port_number);
|
||||
pr_debug("Sent LACPDU on port %d\n",
|
||||
port->actor_port_number);
|
||||
|
||||
/* mark ntt as false, so it will not be sent again until
|
||||
demanded */
|
||||
|
@ -1241,7 +1250,9 @@ static void ad_periodic_machine(struct port *port)
|
|||
|
||||
// check if the state machine was changed
|
||||
if (port->sm_periodic_state != last_state) {
|
||||
pr_debug("Periodic Machine: Port=%d, Last State=%d, Curr State=%d\n", port->actor_port_number, last_state, port->sm_periodic_state);
|
||||
pr_debug("Periodic Machine: Port=%d, Last State=%d, Curr State=%d\n",
|
||||
port->actor_port_number, last_state,
|
||||
port->sm_periodic_state);
|
||||
switch (port->sm_periodic_state) {
|
||||
case AD_NO_PERIODIC:
|
||||
port->sm_periodic_timer_counter = 0; // zero timer
|
||||
|
@ -1298,7 +1309,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);
|
||||
pr_debug("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
|
||||
if (!temp_aggregator->lag_ports) {
|
||||
ad_clear_agg(temp_aggregator);
|
||||
|
@ -1307,9 +1320,7 @@ static void ad_port_selection_logic(struct port *port)
|
|||
}
|
||||
}
|
||||
if (!curr_port) { // meaning: the port was related to an aggregator but was not on the aggregator port list
|
||||
pr_warning(DRV_NAME ": %s: Warning: Port %d (on %s) "
|
||||
"was related to aggregator %d but was not "
|
||||
"on its port list\n",
|
||||
pr_warning("%s: Warning: Port %d (on %s) was related to aggregator %d but was not on its port list\n",
|
||||
port->slave->dev->master->name,
|
||||
port->actor_port_number,
|
||||
port->slave->dev->name,
|
||||
|
@ -1343,7 +1354,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);
|
||||
pr_debug("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;
|
||||
|
@ -1380,10 +1393,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);
|
||||
pr_debug("Port %d joined LAG %d(new LAG)\n",
|
||||
port->actor_port_number,
|
||||
port->aggregator->aggregator_identifier);
|
||||
} else {
|
||||
pr_err(DRV_NAME ": %s: Port %d (on %s) did not find "
|
||||
"a suitable aggregator\n",
|
||||
pr_err("%s: Port %d (on %s) did not find a suitable aggregator\n",
|
||||
port->slave->dev->master->name,
|
||||
port->actor_port_number, port->slave->dev->name);
|
||||
}
|
||||
|
@ -1460,8 +1474,7 @@ static struct aggregator *ad_agg_selection_test(struct aggregator *best,
|
|||
break;
|
||||
|
||||
default:
|
||||
pr_warning(DRV_NAME
|
||||
": %s: Impossible agg select mode %d\n",
|
||||
pr_warning("%s: Impossible agg select mode %d\n",
|
||||
curr->slave->dev->master->name,
|
||||
__get_agg_selection_mode(curr->lag_ports));
|
||||
break;
|
||||
|
@ -1546,40 +1559,38 @@ 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);
|
||||
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");
|
||||
best->lag_ports, best->slave,
|
||||
best->slave ? best->slave->dev->name : "NULL");
|
||||
|
||||
for (agg = __get_first_agg(best->lag_ports); agg;
|
||||
agg = __get_next_agg(agg)) {
|
||||
|
||||
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);
|
||||
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_warning(DRV_NAME ": %s: Warning: No 802.3ad"
|
||||
" response from the link partner for any"
|
||||
" adapters in the bond\n",
|
||||
best->slave->dev->master->name);
|
||||
pr_warning("%s: Warning: No 802.3ad response from the link partner for any adapters in the bond\n",
|
||||
best->slave->dev->master->name);
|
||||
}
|
||||
|
||||
best->is_active = 1;
|
||||
pr_debug("LAG %d chosen as the active LAG\n",
|
||||
best->aggregator_identifier);
|
||||
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);
|
||||
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
|
||||
if (active) {
|
||||
|
@ -1633,7 +1644,8 @@ static void ad_clear_agg(struct aggregator *aggregator)
|
|||
aggregator->lag_ports = NULL;
|
||||
aggregator->is_active = 0;
|
||||
aggregator->num_of_ports = 0;
|
||||
pr_debug("LAG %d was cleared\n", aggregator->aggregator_identifier);
|
||||
pr_debug("LAG %d was cleared\n",
|
||||
aggregator->aggregator_identifier);
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -1728,7 +1740,9 @@ static void ad_initialize_port(struct port *port, int lacp_fast)
|
|||
static void ad_enable_collecting_distributing(struct port *port)
|
||||
{
|
||||
if (port->aggregator->is_active) {
|
||||
pr_debug("Enabling port %d(LAG %d)\n", port->actor_port_number, port->aggregator->aggregator_identifier);
|
||||
pr_debug("Enabling port %d(LAG %d)\n",
|
||||
port->actor_port_number,
|
||||
port->aggregator->aggregator_identifier);
|
||||
__enable_port(port);
|
||||
}
|
||||
}
|
||||
|
@ -1741,7 +1755,9 @@ static void ad_enable_collecting_distributing(struct port *port)
|
|||
static void ad_disable_collecting_distributing(struct port *port)
|
||||
{
|
||||
if (port->aggregator && MAC_ADDRESS_COMPARE(&(port->aggregator->partner_system), &(null_mac_addr))) {
|
||||
pr_debug("Disabling port %d(LAG %d)\n", port->actor_port_number, port->aggregator->aggregator_identifier);
|
||||
pr_debug("Disabling port %d(LAG %d)\n",
|
||||
port->actor_port_number,
|
||||
port->aggregator->aggregator_identifier);
|
||||
__disable_port(port);
|
||||
}
|
||||
}
|
||||
|
@ -1779,7 +1795,8 @@ static void ad_marker_info_send(struct port *port)
|
|||
|
||||
// send the marker information
|
||||
if (ad_marker_send(port, &marker) >= 0) {
|
||||
pr_debug("Sent Marker Information on port %d\n", port->actor_port_number);
|
||||
pr_debug("Sent Marker Information on port %d\n",
|
||||
port->actor_port_number);
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
@ -1803,7 +1820,8 @@ static void ad_marker_info_received(struct bond_marker *marker_info,
|
|||
// send the marker response
|
||||
|
||||
if (ad_marker_send(port, &marker) >= 0) {
|
||||
pr_debug("Sent Marker Response on port %d\n", port->actor_port_number);
|
||||
pr_debug("Sent Marker Response on port %d\n",
|
||||
port->actor_port_number);
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -1889,8 +1907,7 @@ int bond_3ad_bind_slave(struct slave *slave)
|
|||
struct aggregator *aggregator;
|
||||
|
||||
if (bond == NULL) {
|
||||
pr_err(DRV_NAME ": %s: The slave %s is not attached to "
|
||||
"its bond\n",
|
||||
pr_err("%s: The slave %s is not attached to its bond\n",
|
||||
slave->dev->master->name, slave->dev->name);
|
||||
return -1;
|
||||
}
|
||||
|
@ -1966,13 +1983,13 @@ void bond_3ad_unbind_slave(struct slave *slave)
|
|||
|
||||
// if slave is null, the whole port is not initialized
|
||||
if (!port->slave) {
|
||||
pr_warning(DRV_NAME ": Warning: %s: Trying to "
|
||||
"unbind an uninitialized port on %s\n",
|
||||
pr_warning("Warning: %s: Trying to unbind an uninitialized port on %s\n",
|
||||
slave->dev->master->name, slave->dev->name);
|
||||
return;
|
||||
}
|
||||
|
||||
pr_debug("Unbinding Link Aggregation Group %d\n", aggregator->aggregator_identifier);
|
||||
pr_debug("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;
|
||||
|
@ -1996,10 +2013,12 @@ void bond_3ad_unbind_slave(struct slave *slave)
|
|||
// if new aggregator found, copy the aggregator's parameters
|
||||
// and connect the related lag_ports to the 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 - replaceing with LAG %d\n", aggregator->aggregator_identifier, new_aggregator->aggregator_identifier);
|
||||
pr_debug("Some port(s) related to LAG %d - replaceing with LAG %d\n",
|
||||
aggregator->aggregator_identifier,
|
||||
new_aggregator->aggregator_identifier);
|
||||
|
||||
if ((new_aggregator->lag_ports == port) && new_aggregator->is_active) {
|
||||
pr_info(DRV_NAME ": %s: Removing an active aggregator\n",
|
||||
pr_info("%s: Removing an active aggregator\n",
|
||||
aggregator->slave->dev->master->name);
|
||||
// select new active aggregator
|
||||
select_new_active_agg = 1;
|
||||
|
@ -2030,8 +2049,7 @@ void bond_3ad_unbind_slave(struct slave *slave)
|
|||
ad_agg_selection_logic(__get_first_agg(port));
|
||||
}
|
||||
} else {
|
||||
pr_warning(DRV_NAME ": %s: Warning: unbinding aggregator, "
|
||||
"and could not find a new aggregator for its ports\n",
|
||||
pr_warning("%s: Warning: unbinding aggregator, and could not find a new aggregator for its ports\n",
|
||||
slave->dev->master->name);
|
||||
}
|
||||
} else { // in case that the only port related to this aggregator is the one we want to remove
|
||||
|
@ -2039,7 +2057,7 @@ void bond_3ad_unbind_slave(struct slave *slave)
|
|||
// clear the aggregator
|
||||
ad_clear_agg(aggregator);
|
||||
if (select_new_active_agg) {
|
||||
pr_info(DRV_NAME ": %s: Removing an active aggregator\n",
|
||||
pr_info("%s: Removing an active aggregator\n",
|
||||
slave->dev->master->name);
|
||||
// select new active aggregator
|
||||
ad_agg_selection_logic(__get_first_agg(port));
|
||||
|
@ -2066,7 +2084,7 @@ void bond_3ad_unbind_slave(struct slave *slave)
|
|||
// clear the aggregator
|
||||
ad_clear_agg(temp_aggregator);
|
||||
if (select_new_active_agg) {
|
||||
pr_info(DRV_NAME ": %s: Removing an active aggregator\n",
|
||||
pr_info("%s: Removing an active aggregator\n",
|
||||
slave->dev->master->name);
|
||||
// select new active aggregator
|
||||
ad_agg_selection_logic(__get_first_agg(port));
|
||||
|
@ -2115,8 +2133,8 @@ void bond_3ad_state_machine_handler(struct work_struct *work)
|
|||
// select the active aggregator for the bond
|
||||
if ((port = __get_first_port(bond))) {
|
||||
if (!port->slave) {
|
||||
pr_warning(DRV_NAME ": %s: Warning: bond's first port is "
|
||||
"uninitialized\n", bond->dev->name);
|
||||
pr_warning("%s: Warning: bond's first port is uninitialized\n",
|
||||
bond->dev->name);
|
||||
goto re_arm;
|
||||
}
|
||||
|
||||
|
@ -2129,8 +2147,8 @@ void bond_3ad_state_machine_handler(struct work_struct *work)
|
|||
// for each port run the state machines
|
||||
for (port = __get_first_port(bond); port; port = __get_next_port(port)) {
|
||||
if (!port->slave) {
|
||||
pr_warning(DRV_NAME ": %s: Warning: Found an uninitialized "
|
||||
"port\n", bond->dev->name);
|
||||
pr_warning("%s: Warning: Found an uninitialized port\n",
|
||||
bond->dev->name);
|
||||
goto re_arm;
|
||||
}
|
||||
|
||||
|
@ -2171,15 +2189,15 @@ static void bond_3ad_rx_indication(struct lacpdu *lacpdu, struct slave *slave, u
|
|||
port = &(SLAVE_AD_INFO(slave).port);
|
||||
|
||||
if (!port->slave) {
|
||||
pr_warning(DRV_NAME ": %s: Warning: port of slave %s "
|
||||
"is uninitialized\n",
|
||||
pr_warning("%s: Warning: port of slave %s is uninitialized\n",
|
||||
slave->dev->name, slave->dev->master->name);
|
||||
return;
|
||||
}
|
||||
|
||||
switch (lacpdu->subtype) {
|
||||
case AD_TYPE_LACPDU:
|
||||
pr_debug("Received LACPDU on port %d\n", port->actor_port_number);
|
||||
pr_debug("Received LACPDU on port %d\n",
|
||||
port->actor_port_number);
|
||||
ad_rx_machine(lacpdu, port);
|
||||
break;
|
||||
|
||||
|
@ -2188,17 +2206,20 @@ static void bond_3ad_rx_indication(struct lacpdu *lacpdu, struct slave *slave, u
|
|||
|
||||
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);
|
||||
pr_debug("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);
|
||||
pr_debug("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);
|
||||
pr_debug("Received an unknown Marker subtype on slot %d\n",
|
||||
port->actor_port_number);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -2218,8 +2239,7 @@ void bond_3ad_adapter_speed_changed(struct slave *slave)
|
|||
|
||||
// if slave is null, the whole port is not initialized
|
||||
if (!port->slave) {
|
||||
pr_warning(DRV_NAME ": Warning: %s: speed "
|
||||
"changed for uninitialized port on %s\n",
|
||||
pr_warning("Warning: %s: speed changed for uninitialized port on %s\n",
|
||||
slave->dev->master->name, slave->dev->name);
|
||||
return;
|
||||
}
|
||||
|
@ -2246,8 +2266,7 @@ void bond_3ad_adapter_duplex_changed(struct slave *slave)
|
|||
|
||||
// if slave is null, the whole port is not initialized
|
||||
if (!port->slave) {
|
||||
pr_warning(DRV_NAME ": %s: Warning: duplex changed "
|
||||
"for uninitialized port on %s\n",
|
||||
pr_warning("%s: Warning: duplex changed for uninitialized port on %s\n",
|
||||
slave->dev->master->name, slave->dev->name);
|
||||
return;
|
||||
}
|
||||
|
@ -2275,8 +2294,7 @@ 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_warning(DRV_NAME ": Warning: %s: link status changed for "
|
||||
"uninitialized port on %s\n",
|
||||
pr_warning("Warning: %s: link status changed for uninitialized port on %s\n",
|
||||
slave->dev->master->name, slave->dev->name);
|
||||
return;
|
||||
}
|
||||
|
@ -2381,8 +2399,8 @@ int bond_3ad_xmit_xor(struct sk_buff *skb, struct net_device *dev)
|
|||
}
|
||||
|
||||
if (bond_3ad_get_active_agg_info(bond, &ad_info)) {
|
||||
pr_debug(DRV_NAME ": %s: Error: "
|
||||
"bond_3ad_get_active_agg_info failed\n", dev->name);
|
||||
pr_debug("%s: Error: bond_3ad_get_active_agg_info failed\n",
|
||||
dev->name);
|
||||
goto out;
|
||||
}
|
||||
|
||||
|
@ -2391,8 +2409,7 @@ int bond_3ad_xmit_xor(struct sk_buff *skb, struct net_device *dev)
|
|||
|
||||
if (slaves_in_agg == 0) {
|
||||
/*the aggregator is empty*/
|
||||
pr_debug(DRV_NAME ": %s: Error: active aggregator is empty\n",
|
||||
dev->name);
|
||||
pr_debug("%s: Error: active aggregator is empty\n", dev->name);
|
||||
goto out;
|
||||
}
|
||||
|
||||
|
@ -2410,8 +2427,8 @@ int bond_3ad_xmit_xor(struct sk_buff *skb, struct net_device *dev)
|
|||
}
|
||||
|
||||
if (slave_agg_no >= 0) {
|
||||
pr_err(DRV_NAME ": %s: Error: Couldn't find a slave to tx on "
|
||||
"for aggregator ID %d\n", dev->name, agg_id);
|
||||
pr_err("%s: Error: Couldn't find a slave to tx on for aggregator ID %d\n",
|
||||
dev->name, agg_id);
|
||||
goto out;
|
||||
}
|
||||
|
||||
|
|
|
@ -20,6 +20,8 @@
|
|||
*
|
||||
*/
|
||||
|
||||
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
|
||||
|
||||
#include <linux/skbuff.h>
|
||||
#include <linux/netdevice.h>
|
||||
#include <linux/etherdevice.h>
|
||||
|
@ -201,8 +203,7 @@ static int tlb_initialize(struct bonding *bond)
|
|||
|
||||
new_hashtbl = kzalloc(size, GFP_KERNEL);
|
||||
if (!new_hashtbl) {
|
||||
pr_err(DRV_NAME
|
||||
": %s: Error: Failed to allocate TLB hash table\n",
|
||||
pr_err("%s: Error: Failed to allocate TLB hash table\n",
|
||||
bond->dev->name);
|
||||
return -1;
|
||||
}
|
||||
|
@ -514,8 +515,7 @@ 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(DRV_NAME
|
||||
": %s: Error: failed to create an ARP packet\n",
|
||||
pr_err("%s: Error: failed to create an ARP packet\n",
|
||||
client_info->slave->dev->master->name);
|
||||
continue;
|
||||
}
|
||||
|
@ -525,8 +525,7 @@ static void rlb_update_client(struct rlb_client_info *client_info)
|
|||
if (client_info->tag) {
|
||||
skb = vlan_put_tag(skb, client_info->vlan_id);
|
||||
if (!skb) {
|
||||
pr_err(DRV_NAME
|
||||
": %s: Error: failed to insert VLAN tag\n",
|
||||
pr_err("%s: Error: failed to insert VLAN tag\n",
|
||||
client_info->slave->dev->master->name);
|
||||
continue;
|
||||
}
|
||||
|
@ -609,9 +608,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(DRV_NAME
|
||||
": %s: Error: found a client with no channel in "
|
||||
"the client's hash table\n",
|
||||
pr_err("%s: Error: found a client with no channel in the client's hash table\n",
|
||||
bond->dev->name);
|
||||
continue;
|
||||
}
|
||||
|
@ -806,8 +803,7 @@ static int rlb_initialize(struct bonding *bond)
|
|||
|
||||
new_hashtbl = kmalloc(size, GFP_KERNEL);
|
||||
if (!new_hashtbl) {
|
||||
pr_err(DRV_NAME
|
||||
": %s: Error: Failed to allocate RLB hash table\n",
|
||||
pr_err("%s: Error: Failed to allocate RLB hash table\n",
|
||||
bond->dev->name);
|
||||
return -1;
|
||||
}
|
||||
|
@ -928,8 +924,7 @@ static void alb_send_learning_packets(struct slave *slave, u8 mac_addr[])
|
|||
|
||||
skb = vlan_put_tag(skb, vlan->vlan_id);
|
||||
if (!skb) {
|
||||
pr_err(DRV_NAME
|
||||
": %s: Error: failed to insert VLAN tag\n",
|
||||
pr_err("%s: Error: failed to insert VLAN tag\n",
|
||||
bond->dev->name);
|
||||
continue;
|
||||
}
|
||||
|
@ -958,11 +953,8 @@ static int alb_set_slave_mac_addr(struct slave *slave, u8 addr[], int hw)
|
|||
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(DRV_NAME
|
||||
": %s: Error: 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",
|
||||
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",
|
||||
dev->master->name, dev->name);
|
||||
return -EOPNOTSUPP;
|
||||
}
|
||||
|
@ -1169,18 +1161,12 @@ static int alb_handle_addr_collision_on_attach(struct bonding *bond, struct slav
|
|||
alb_set_slave_mac_addr(slave, free_mac_slave->perm_hwaddr,
|
||||
bond->alb_info.rlb_enabled);
|
||||
|
||||
pr_warning(DRV_NAME
|
||||
": %s: Warning: the hw address of slave %s is "
|
||||
"in use by the bond; giving it the hw address "
|
||||
"of %s\n",
|
||||
pr_warning("%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);
|
||||
|
||||
} else if (has_bond_addr) {
|
||||
pr_err(DRV_NAME
|
||||
": %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",
|
||||
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);
|
||||
return -EFAULT;
|
||||
}
|
||||
|
|
|
@ -20,6 +20,8 @@
|
|||
*
|
||||
*/
|
||||
|
||||
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
|
||||
|
||||
#include <linux/types.h>
|
||||
#include <linux/if_vlan.h>
|
||||
#include <net/ipv6.h>
|
||||
|
@ -74,20 +76,20 @@ static void bond_na_send(struct net_device *slave_dev,
|
|||
addrconf_addr_solict_mult(daddr, &mcaddr);
|
||||
|
||||
pr_debug("ipv6 na on slave %s: dest %pI6, src %pI6\n",
|
||||
slave_dev->name, &mcaddr, daddr);
|
||||
slave_dev->name, &mcaddr, daddr);
|
||||
|
||||
skb = ndisc_build_skb(slave_dev, &mcaddr, daddr, &icmp6h, daddr,
|
||||
ND_OPT_TARGET_LL_ADDR);
|
||||
|
||||
if (!skb) {
|
||||
pr_err(DRV_NAME ": NA packet allocation failed\n");
|
||||
pr_err("NA packet allocation failed\n");
|
||||
return;
|
||||
}
|
||||
|
||||
if (vlan_id) {
|
||||
skb = vlan_put_tag(skb, vlan_id);
|
||||
if (!skb) {
|
||||
pr_err(DRV_NAME ": failed to insert VLAN tag\n");
|
||||
pr_err("failed to insert VLAN tag\n");
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
@ -109,8 +111,8 @@ void bond_send_unsolicited_na(struct bonding *bond)
|
|||
struct inet6_dev *idev;
|
||||
int is_router;
|
||||
|
||||
pr_debug("bond_send_unsol_na: bond %s slave %s\n", bond->dev->name,
|
||||
slave ? slave->dev->name : "NULL");
|
||||
pr_debug("%s: bond %s slave %s\n", bond->dev->name,
|
||||
__func__, slave ? slave->dev->name : "NULL");
|
||||
|
||||
if (!slave || !bond->send_unsol_na ||
|
||||
test_bit(__LINK_STATE_LINKWATCH_PENDING, &slave->dev->state))
|
||||
|
|
File diff suppressed because it is too large
Load diff
|
@ -19,6 +19,9 @@
|
|||
* file called LICENSE.
|
||||
*
|
||||
*/
|
||||
|
||||
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
|
||||
|
||||
#include <linux/kernel.h>
|
||||
#include <linux/module.h>
|
||||
#include <linux/device.h>
|
||||
|
@ -109,11 +112,10 @@ static ssize_t bonding_store_bonds(struct class *cls,
|
|||
goto err_no_cmd;
|
||||
|
||||
if (command[0] == '+') {
|
||||
pr_info(DRV_NAME
|
||||
": %s is being created...\n", ifname);
|
||||
pr_info("%s is being created...\n", ifname);
|
||||
rv = bond_create(net, ifname);
|
||||
if (rv) {
|
||||
pr_info(DRV_NAME ": Bond creation failed.\n");
|
||||
pr_info("Bond creation failed.\n");
|
||||
res = rv;
|
||||
}
|
||||
} else if (command[0] == '-') {
|
||||
|
@ -122,12 +124,10 @@ static ssize_t bonding_store_bonds(struct class *cls,
|
|||
rtnl_lock();
|
||||
bond_dev = bond_get_by_name(net, ifname);
|
||||
if (bond_dev) {
|
||||
pr_info(DRV_NAME ": %s is being deleted...\n",
|
||||
ifname);
|
||||
pr_info("%s is being deleted...\n", ifname);
|
||||
unregister_netdevice(bond_dev);
|
||||
} else {
|
||||
pr_err(DRV_NAME ": unable to delete non-existent %s\n",
|
||||
ifname);
|
||||
pr_err("unable to delete non-existent %s\n", ifname);
|
||||
res = -ENODEV;
|
||||
}
|
||||
rtnl_unlock();
|
||||
|
@ -140,8 +140,7 @@ static ssize_t bonding_store_bonds(struct class *cls,
|
|||
return res;
|
||||
|
||||
err_no_cmd:
|
||||
pr_err(DRV_NAME ": 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;
|
||||
}
|
||||
|
||||
|
@ -225,8 +224,8 @@ static ssize_t bonding_store_slaves(struct device *d,
|
|||
|
||||
/* Quick sanity check -- is the bond interface up? */
|
||||
if (!(bond->dev->flags & IFF_UP)) {
|
||||
pr_warning(DRV_NAME ": %s: doing slave updates when "
|
||||
"interface is down.\n", bond->dev->name);
|
||||
pr_warning("%s: doing slave updates when interface is down.\n",
|
||||
bond->dev->name);
|
||||
}
|
||||
|
||||
/* Note: We can't hold bond->lock here, as bond_create grabs it. */
|
||||
|
@ -247,17 +246,14 @@ static ssize_t bonding_store_slaves(struct device *d,
|
|||
|
||||
dev = __dev_get_by_name(dev_net(bond->dev), ifname);
|
||||
if (!dev) {
|
||||
pr_info(DRV_NAME
|
||||
": %s: Interface %s does not exist!\n",
|
||||
bond->dev->name, ifname);
|
||||
pr_info("%s: Interface %s does not exist!\n",
|
||||
bond->dev->name, ifname);
|
||||
ret = -ENODEV;
|
||||
goto out;
|
||||
}
|
||||
|
||||
if (dev->flags & IFF_UP) {
|
||||
pr_err(DRV_NAME
|
||||
": %s: Error: Unable to enslave %s "
|
||||
"because it is already up.\n",
|
||||
pr_err("%s: Error: Unable to enslave %s because it is already up.\n",
|
||||
bond->dev->name, dev->name);
|
||||
ret = -EPERM;
|
||||
goto out;
|
||||
|
@ -266,8 +262,7 @@ static ssize_t bonding_store_slaves(struct device *d,
|
|||
read_lock(&bond->lock);
|
||||
bond_for_each_slave(bond, slave, i)
|
||||
if (slave->dev == dev) {
|
||||
pr_err(DRV_NAME
|
||||
": %s: Interface %s is already enslaved!\n",
|
||||
pr_err("%s: Interface %s is already enslaved!\n",
|
||||
bond->dev->name, ifname);
|
||||
ret = -EPERM;
|
||||
read_unlock(&bond->lock);
|
||||
|
@ -275,8 +270,7 @@ static ssize_t bonding_store_slaves(struct device *d,
|
|||
}
|
||||
read_unlock(&bond->lock);
|
||||
|
||||
pr_info(DRV_NAME ": %s: Adding slave %s.\n",
|
||||
bond->dev->name, ifname);
|
||||
pr_info("%s: Adding slave %s.\n", bond->dev->name, ifname);
|
||||
|
||||
/* If this is the first slave, then we need to set
|
||||
the master's hardware address to be the same as the
|
||||
|
@ -313,7 +307,7 @@ static ssize_t bonding_store_slaves(struct device *d,
|
|||
break;
|
||||
}
|
||||
if (dev) {
|
||||
pr_info(DRV_NAME ": %s: Removing slave %s\n",
|
||||
pr_info("%s: Removing slave %s\n",
|
||||
bond->dev->name, dev->name);
|
||||
res = bond_release(bond->dev, dev);
|
||||
if (res) {
|
||||
|
@ -323,16 +317,16 @@ static ssize_t bonding_store_slaves(struct device *d,
|
|||
/* set the slave MTU to the default */
|
||||
dev_set_mtu(dev, original_mtu);
|
||||
} else {
|
||||
pr_err(DRV_NAME ": unable to remove non-existent"
|
||||
" slave %s for bond %s.\n",
|
||||
ifname, bond->dev->name);
|
||||
pr_err("unable to remove non-existent slave %s for bond %s.\n",
|
||||
ifname, bond->dev->name);
|
||||
ret = -ENODEV;
|
||||
}
|
||||
goto out;
|
||||
}
|
||||
|
||||
err_no_cmd:
|
||||
pr_err(DRV_NAME ": no command found in slaves file for bond %s. Use +ifname or -ifname.\n", bond->dev->name);
|
||||
pr_err("no command found in slaves file for bond %s. Use +ifname or -ifname.\n",
|
||||
bond->dev->name);
|
||||
ret = -EPERM;
|
||||
|
||||
out:
|
||||
|
@ -365,18 +359,16 @@ static ssize_t bonding_store_mode(struct device *d,
|
|||
struct bonding *bond = to_bond(d);
|
||||
|
||||
if (bond->dev->flags & IFF_UP) {
|
||||
pr_err(DRV_NAME ": unable to update mode of %s"
|
||||
" because interface is up.\n", bond->dev->name);
|
||||
pr_err("unable to update mode of %s because interface is up.\n",
|
||||
bond->dev->name);
|
||||
ret = -EPERM;
|
||||
goto out;
|
||||
}
|
||||
|
||||
new_value = bond_parse_parm(buf, bond_mode_tbl);
|
||||
if (new_value < 0) {
|
||||
pr_err(DRV_NAME
|
||||
": %s: Ignoring invalid mode value %.*s.\n",
|
||||
bond->dev->name,
|
||||
(int)strlen(buf) - 1, buf);
|
||||
pr_err("%s: Ignoring invalid mode value %.*s.\n",
|
||||
bond->dev->name, (int)strlen(buf) - 1, buf);
|
||||
ret = -EINVAL;
|
||||
goto out;
|
||||
} else {
|
||||
|
@ -388,8 +380,8 @@ static ssize_t bonding_store_mode(struct device *d,
|
|||
|
||||
bond->params.mode = new_value;
|
||||
bond_set_mode_ops(bond, bond->params.mode);
|
||||
pr_info(DRV_NAME ": %s: setting mode to %s (%d).\n",
|
||||
bond->dev->name, bond_mode_tbl[new_value].modename,
|
||||
pr_info("%s: setting mode to %s (%d).\n",
|
||||
bond->dev->name, bond_mode_tbl[new_value].modename,
|
||||
new_value);
|
||||
}
|
||||
out:
|
||||
|
@ -421,8 +413,7 @@ static ssize_t bonding_store_xmit_hash(struct device *d,
|
|||
struct bonding *bond = to_bond(d);
|
||||
|
||||
if (bond->dev->flags & IFF_UP) {
|
||||
pr_err(DRV_NAME
|
||||
"%s: Interface is up. Unable to update xmit policy.\n",
|
||||
pr_err("%s: Interface is up. Unable to update xmit policy.\n",
|
||||
bond->dev->name);
|
||||
ret = -EPERM;
|
||||
goto out;
|
||||
|
@ -430,8 +421,7 @@ static ssize_t bonding_store_xmit_hash(struct device *d,
|
|||
|
||||
new_value = bond_parse_parm(buf, xmit_hashtype_tbl);
|
||||
if (new_value < 0) {
|
||||
pr_err(DRV_NAME
|
||||
": %s: Ignoring invalid xmit hash policy value %.*s.\n",
|
||||
pr_err("%s: Ignoring invalid xmit hash policy value %.*s.\n",
|
||||
bond->dev->name,
|
||||
(int)strlen(buf) - 1, buf);
|
||||
ret = -EINVAL;
|
||||
|
@ -439,7 +429,7 @@ static ssize_t bonding_store_xmit_hash(struct device *d,
|
|||
} else {
|
||||
bond->params.xmit_policy = new_value;
|
||||
bond_set_mode_ops(bond, bond->params.mode);
|
||||
pr_info(DRV_NAME ": %s: setting xmit hash policy to %s (%d).\n",
|
||||
pr_info("%s: setting xmit hash policy to %s (%d).\n",
|
||||
bond->dev->name,
|
||||
xmit_hashtype_tbl[new_value].modename, new_value);
|
||||
}
|
||||
|
@ -472,20 +462,18 @@ static ssize_t bonding_store_arp_validate(struct device *d,
|
|||
|
||||
new_value = bond_parse_parm(buf, arp_validate_tbl);
|
||||
if (new_value < 0) {
|
||||
pr_err(DRV_NAME
|
||||
": %s: Ignoring invalid arp_validate value %s\n",
|
||||
pr_err("%s: Ignoring invalid arp_validate value %s\n",
|
||||
bond->dev->name, buf);
|
||||
return -EINVAL;
|
||||
}
|
||||
if (new_value && (bond->params.mode != BOND_MODE_ACTIVEBACKUP)) {
|
||||
pr_err(DRV_NAME
|
||||
": %s: arp_validate only supported in active-backup mode.\n",
|
||||
pr_err("%s: arp_validate only supported in active-backup mode.\n",
|
||||
bond->dev->name);
|
||||
return -EINVAL;
|
||||
}
|
||||
pr_info(DRV_NAME ": %s: setting arp_validate to %s (%d).\n",
|
||||
bond->dev->name, arp_validate_tbl[new_value].modename,
|
||||
new_value);
|
||||
pr_info("%s: setting arp_validate to %s (%d).\n",
|
||||
bond->dev->name, arp_validate_tbl[new_value].modename,
|
||||
new_value);
|
||||
|
||||
if (!bond->params.arp_validate && new_value)
|
||||
bond_register_arp(bond);
|
||||
|
@ -523,24 +511,22 @@ static ssize_t bonding_store_fail_over_mac(struct device *d,
|
|||
struct bonding *bond = to_bond(d);
|
||||
|
||||
if (bond->slave_cnt != 0) {
|
||||
pr_err(DRV_NAME
|
||||
": %s: Can't alter fail_over_mac with slaves in bond.\n",
|
||||
pr_err("%s: Can't alter fail_over_mac with slaves in bond.\n",
|
||||
bond->dev->name);
|
||||
return -EPERM;
|
||||
}
|
||||
|
||||
new_value = bond_parse_parm(buf, fail_over_mac_tbl);
|
||||
if (new_value < 0) {
|
||||
pr_err(DRV_NAME
|
||||
": %s: Ignoring invalid fail_over_mac value %s.\n",
|
||||
pr_err("%s: Ignoring invalid fail_over_mac value %s.\n",
|
||||
bond->dev->name, buf);
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
bond->params.fail_over_mac = new_value;
|
||||
pr_info(DRV_NAME ": %s: Setting fail_over_mac to %s (%d).\n",
|
||||
bond->dev->name, fail_over_mac_tbl[new_value].modename,
|
||||
new_value);
|
||||
pr_info("%s: Setting fail_over_mac to %s (%d).\n",
|
||||
bond->dev->name, fail_over_mac_tbl[new_value].modename,
|
||||
new_value);
|
||||
|
||||
return count;
|
||||
}
|
||||
|
@ -571,31 +557,26 @@ static ssize_t bonding_store_arp_interval(struct device *d,
|
|||
struct bonding *bond = to_bond(d);
|
||||
|
||||
if (sscanf(buf, "%d", &new_value) != 1) {
|
||||
pr_err(DRV_NAME
|
||||
": %s: no arp_interval value specified.\n",
|
||||
pr_err("%s: no arp_interval value specified.\n",
|
||||
bond->dev->name);
|
||||
ret = -EINVAL;
|
||||
goto out;
|
||||
}
|
||||
if (new_value < 0) {
|
||||
pr_err(DRV_NAME
|
||||
": %s: Invalid arp_interval value %d not in range 1-%d; rejected.\n",
|
||||
pr_err("%s: Invalid arp_interval value %d not in range 1-%d; rejected.\n",
|
||||
bond->dev->name, new_value, INT_MAX);
|
||||
ret = -EINVAL;
|
||||
goto out;
|
||||
}
|
||||
|
||||
pr_info(DRV_NAME
|
||||
": %s: Setting ARP monitoring interval to %d.\n",
|
||||
bond->dev->name, new_value);
|
||||
pr_info("%s: Setting ARP monitoring interval to %d.\n",
|
||||
bond->dev->name, new_value);
|
||||
bond->params.arp_interval = new_value;
|
||||
if (bond->params.arp_interval)
|
||||
bond->dev->priv_flags |= IFF_MASTER_ARPMON;
|
||||
if (bond->params.miimon) {
|
||||
pr_info(DRV_NAME
|
||||
": %s: ARP monitoring cannot be used with MII monitoring. "
|
||||
"%s Disabling MII monitoring.\n",
|
||||
bond->dev->name, bond->dev->name);
|
||||
pr_info("%s: ARP monitoring cannot be used with MII monitoring. %s Disabling MII monitoring.\n",
|
||||
bond->dev->name, bond->dev->name);
|
||||
bond->params.miimon = 0;
|
||||
if (delayed_work_pending(&bond->mii_work)) {
|
||||
cancel_delayed_work(&bond->mii_work);
|
||||
|
@ -603,10 +584,8 @@ static ssize_t bonding_store_arp_interval(struct device *d,
|
|||
}
|
||||
}
|
||||
if (!bond->params.arp_targets[0]) {
|
||||
pr_info(DRV_NAME
|
||||
": %s: ARP monitoring has been set up, "
|
||||
"but no ARP targets have been specified.\n",
|
||||
bond->dev->name);
|
||||
pr_info("%s: ARP monitoring has been set up, but no ARP targets have been specified.\n",
|
||||
bond->dev->name);
|
||||
}
|
||||
if (bond->dev->flags & IFF_UP) {
|
||||
/* If the interface is up, we may need to fire off
|
||||
|
@ -666,8 +645,7 @@ static ssize_t bonding_store_arp_targets(struct device *d,
|
|||
/* look for adds */
|
||||
if (buf[0] == '+') {
|
||||
if ((newtarget == 0) || (newtarget == htonl(INADDR_BROADCAST))) {
|
||||
pr_err(DRV_NAME
|
||||
": %s: invalid ARP target %pI4 specified for addition\n",
|
||||
pr_err("%s: invalid ARP target %pI4 specified for addition\n",
|
||||
bond->dev->name, &newtarget);
|
||||
ret = -EINVAL;
|
||||
goto out;
|
||||
|
@ -675,23 +653,20 @@ static ssize_t bonding_store_arp_targets(struct device *d,
|
|||
/* look for an empty slot to put the target in, and check for dupes */
|
||||
for (i = 0; (i < BOND_MAX_ARP_TARGETS) && !done; i++) {
|
||||
if (targets[i] == newtarget) { /* duplicate */
|
||||
pr_err(DRV_NAME
|
||||
": %s: ARP target %pI4 is already present\n",
|
||||
pr_err("%s: ARP target %pI4 is already present\n",
|
||||
bond->dev->name, &newtarget);
|
||||
ret = -EINVAL;
|
||||
goto out;
|
||||
}
|
||||
if (targets[i] == 0) {
|
||||
pr_info(DRV_NAME
|
||||
": %s: adding ARP target %pI4.\n",
|
||||
bond->dev->name, &newtarget);
|
||||
pr_info("%s: adding ARP target %pI4.\n",
|
||||
bond->dev->name, &newtarget);
|
||||
done = 1;
|
||||
targets[i] = newtarget;
|
||||
}
|
||||
}
|
||||
if (!done) {
|
||||
pr_err(DRV_NAME
|
||||
": %s: ARP target table is full!\n",
|
||||
pr_err("%s: ARP target table is full!\n",
|
||||
bond->dev->name);
|
||||
ret = -EINVAL;
|
||||
goto out;
|
||||
|
@ -699,8 +674,7 @@ static ssize_t bonding_store_arp_targets(struct device *d,
|
|||
|
||||
} else if (buf[0] == '-') {
|
||||
if ((newtarget == 0) || (newtarget == htonl(INADDR_BROADCAST))) {
|
||||
pr_err(DRV_NAME
|
||||
": %s: invalid ARP target %pI4 specified for removal\n",
|
||||
pr_err("%s: invalid ARP target %pI4 specified for removal\n",
|
||||
bond->dev->name, &newtarget);
|
||||
ret = -EINVAL;
|
||||
goto out;
|
||||
|
@ -709,9 +683,8 @@ static ssize_t bonding_store_arp_targets(struct device *d,
|
|||
for (i = 0; (i < BOND_MAX_ARP_TARGETS) && !done; i++) {
|
||||
if (targets[i] == newtarget) {
|
||||
int j;
|
||||
pr_info(DRV_NAME
|
||||
": %s: removing ARP target %pI4.\n",
|
||||
bond->dev->name, &newtarget);
|
||||
pr_info("%s: removing ARP target %pI4.\n",
|
||||
bond->dev->name, &newtarget);
|
||||
for (j = i; (j < (BOND_MAX_ARP_TARGETS-1)) && targets[j+1]; j++)
|
||||
targets[j] = targets[j+1];
|
||||
|
||||
|
@ -720,16 +693,14 @@ static ssize_t bonding_store_arp_targets(struct device *d,
|
|||
}
|
||||
}
|
||||
if (!done) {
|
||||
pr_info(DRV_NAME
|
||||
": %s: unable to remove nonexistent ARP target %pI4.\n",
|
||||
bond->dev->name, &newtarget);
|
||||
pr_info("%s: unable to remove nonexistent ARP target %pI4.\n",
|
||||
bond->dev->name, &newtarget);
|
||||
ret = -EINVAL;
|
||||
goto out;
|
||||
}
|
||||
} else {
|
||||
pr_err(DRV_NAME ": no command found in arp_ip_targets file"
|
||||
" for bond %s. Use +<addr> or -<addr>.\n",
|
||||
bond->dev->name);
|
||||
pr_err("no command found in arp_ip_targets file for bond %s. Use +<addr> or -<addr>.\n",
|
||||
bond->dev->name);
|
||||
ret = -EPERM;
|
||||
goto out;
|
||||
}
|
||||
|
@ -761,41 +732,34 @@ static ssize_t bonding_store_downdelay(struct device *d,
|
|||
struct bonding *bond = to_bond(d);
|
||||
|
||||
if (!(bond->params.miimon)) {
|
||||
pr_err(DRV_NAME
|
||||
": %s: Unable to set down delay as MII monitoring is disabled\n",
|
||||
pr_err("%s: Unable to set down delay as MII monitoring is disabled\n",
|
||||
bond->dev->name);
|
||||
ret = -EPERM;
|
||||
goto out;
|
||||
}
|
||||
|
||||
if (sscanf(buf, "%d", &new_value) != 1) {
|
||||
pr_err(DRV_NAME
|
||||
": %s: no down delay value specified.\n",
|
||||
bond->dev->name);
|
||||
pr_err("%s: no down delay value specified.\n", bond->dev->name);
|
||||
ret = -EINVAL;
|
||||
goto out;
|
||||
}
|
||||
if (new_value < 0) {
|
||||
pr_err(DRV_NAME
|
||||
": %s: Invalid down delay value %d not in range %d-%d; rejected.\n",
|
||||
pr_err("%s: Invalid down delay value %d not in range %d-%d; rejected.\n",
|
||||
bond->dev->name, new_value, 1, INT_MAX);
|
||||
ret = -EINVAL;
|
||||
goto out;
|
||||
} else {
|
||||
if ((new_value % bond->params.miimon) != 0) {
|
||||
pr_warning(DRV_NAME
|
||||
": %s: Warning: down delay (%d) is not a "
|
||||
"multiple of miimon (%d), delay rounded "
|
||||
"to %d ms\n",
|
||||
pr_warning("%s: Warning: down delay (%d) is not a multiple of miimon (%d), delay rounded to %d ms\n",
|
||||
bond->dev->name, new_value,
|
||||
bond->params.miimon,
|
||||
(new_value / bond->params.miimon) *
|
||||
bond->params.miimon);
|
||||
}
|
||||
bond->params.downdelay = new_value / bond->params.miimon;
|
||||
pr_info(DRV_NAME ": %s: Setting down delay to %d.\n",
|
||||
bond->dev->name,
|
||||
bond->params.downdelay * bond->params.miimon);
|
||||
pr_info("%s: Setting down delay to %d.\n",
|
||||
bond->dev->name,
|
||||
bond->params.downdelay * bond->params.miimon);
|
||||
|
||||
}
|
||||
|
||||
|
@ -823,41 +787,35 @@ static ssize_t bonding_store_updelay(struct device *d,
|
|||
struct bonding *bond = to_bond(d);
|
||||
|
||||
if (!(bond->params.miimon)) {
|
||||
pr_err(DRV_NAME
|
||||
": %s: Unable to set up delay as MII monitoring is disabled\n",
|
||||
pr_err("%s: Unable to set up delay as MII monitoring is disabled\n",
|
||||
bond->dev->name);
|
||||
ret = -EPERM;
|
||||
goto out;
|
||||
}
|
||||
|
||||
if (sscanf(buf, "%d", &new_value) != 1) {
|
||||
pr_err(DRV_NAME
|
||||
": %s: no up delay value specified.\n",
|
||||
pr_err("%s: no up delay value specified.\n",
|
||||
bond->dev->name);
|
||||
ret = -EINVAL;
|
||||
goto out;
|
||||
}
|
||||
if (new_value < 0) {
|
||||
pr_err(DRV_NAME
|
||||
": %s: Invalid down delay value %d not in range %d-%d; rejected.\n",
|
||||
pr_err("%s: Invalid down delay value %d not in range %d-%d; rejected.\n",
|
||||
bond->dev->name, new_value, 1, INT_MAX);
|
||||
ret = -EINVAL;
|
||||
goto out;
|
||||
} else {
|
||||
if ((new_value % bond->params.miimon) != 0) {
|
||||
pr_warning(DRV_NAME
|
||||
": %s: Warning: up delay (%d) is not a "
|
||||
"multiple of miimon (%d), updelay rounded "
|
||||
"to %d ms\n",
|
||||
pr_warning("%s: Warning: up delay (%d) is not a multiple of miimon (%d), updelay rounded to %d ms\n",
|
||||
bond->dev->name, new_value,
|
||||
bond->params.miimon,
|
||||
(new_value / bond->params.miimon) *
|
||||
bond->params.miimon);
|
||||
}
|
||||
bond->params.updelay = new_value / bond->params.miimon;
|
||||
pr_info(DRV_NAME ": %s: Setting up delay to %d.\n",
|
||||
bond->dev->name, bond->params.updelay * bond->params.miimon);
|
||||
|
||||
pr_info("%s: Setting up delay to %d.\n",
|
||||
bond->dev->name,
|
||||
bond->params.updelay * bond->params.miimon);
|
||||
}
|
||||
|
||||
out:
|
||||
|
@ -889,16 +847,14 @@ static ssize_t bonding_store_lacp(struct device *d,
|
|||
struct bonding *bond = to_bond(d);
|
||||
|
||||
if (bond->dev->flags & IFF_UP) {
|
||||
pr_err(DRV_NAME
|
||||
": %s: Unable to update LACP rate because interface is up.\n",
|
||||
pr_err("%s: Unable to update LACP rate because interface is up.\n",
|
||||
bond->dev->name);
|
||||
ret = -EPERM;
|
||||
goto out;
|
||||
}
|
||||
|
||||
if (bond->params.mode != BOND_MODE_8023AD) {
|
||||
pr_err(DRV_NAME
|
||||
": %s: Unable to update LACP rate because bond is not in 802.3ad mode.\n",
|
||||
pr_err("%s: Unable to update LACP rate because bond is not in 802.3ad mode.\n",
|
||||
bond->dev->name);
|
||||
ret = -EPERM;
|
||||
goto out;
|
||||
|
@ -908,12 +864,11 @@ static ssize_t bonding_store_lacp(struct device *d,
|
|||
|
||||
if ((new_value == 1) || (new_value == 0)) {
|
||||
bond->params.lacp_fast = new_value;
|
||||
pr_info(DRV_NAME ": %s: Setting LACP rate to %s (%d).\n",
|
||||
pr_info("%s: Setting LACP rate to %s (%d).\n",
|
||||
bond->dev->name, bond_lacp_tbl[new_value].modename,
|
||||
new_value);
|
||||
} else {
|
||||
pr_err(DRV_NAME
|
||||
": %s: Ignoring invalid LACP rate value %.*s.\n",
|
||||
pr_err("%s: Ignoring invalid LACP rate value %.*s.\n",
|
||||
bond->dev->name, (int)strlen(buf) - 1, buf);
|
||||
ret = -EINVAL;
|
||||
}
|
||||
|
@ -943,9 +898,8 @@ static ssize_t bonding_store_ad_select(struct device *d,
|
|||
struct bonding *bond = to_bond(d);
|
||||
|
||||
if (bond->dev->flags & IFF_UP) {
|
||||
pr_err(DRV_NAME
|
||||
": %s: Unable to update ad_select because interface "
|
||||
"is up.\n", bond->dev->name);
|
||||
pr_err("%s: Unable to update ad_select because interface is up.\n",
|
||||
bond->dev->name);
|
||||
ret = -EPERM;
|
||||
goto out;
|
||||
}
|
||||
|
@ -954,13 +908,11 @@ static ssize_t bonding_store_ad_select(struct device *d,
|
|||
|
||||
if (new_value != -1) {
|
||||
bond->params.ad_select = new_value;
|
||||
pr_info(DRV_NAME
|
||||
": %s: Setting ad_select to %s (%d).\n",
|
||||
bond->dev->name, ad_select_tbl[new_value].modename,
|
||||
new_value);
|
||||
pr_info("%s: Setting ad_select to %s (%d).\n",
|
||||
bond->dev->name, ad_select_tbl[new_value].modename,
|
||||
new_value);
|
||||
} else {
|
||||
pr_err(DRV_NAME
|
||||
": %s: Ignoring invalid ad_select value %.*s.\n",
|
||||
pr_err("%s: Ignoring invalid ad_select value %.*s.\n",
|
||||
bond->dev->name, (int)strlen(buf) - 1, buf);
|
||||
ret = -EINVAL;
|
||||
}
|
||||
|
@ -990,15 +942,13 @@ static ssize_t bonding_store_n_grat_arp(struct device *d,
|
|||
struct bonding *bond = to_bond(d);
|
||||
|
||||
if (sscanf(buf, "%d", &new_value) != 1) {
|
||||
pr_err(DRV_NAME
|
||||
": %s: no num_grat_arp value specified.\n",
|
||||
pr_err("%s: no num_grat_arp value specified.\n",
|
||||
bond->dev->name);
|
||||
ret = -EINVAL;
|
||||
goto out;
|
||||
}
|
||||
if (new_value < 0 || new_value > 255) {
|
||||
pr_err(DRV_NAME
|
||||
": %s: Invalid num_grat_arp value %d not in range 0-255; rejected.\n",
|
||||
pr_err("%s: Invalid num_grat_arp value %d not in range 0-255; rejected.\n",
|
||||
bond->dev->name, new_value);
|
||||
ret = -EINVAL;
|
||||
goto out;
|
||||
|
@ -1031,16 +981,14 @@ static ssize_t bonding_store_n_unsol_na(struct device *d,
|
|||
struct bonding *bond = to_bond(d);
|
||||
|
||||
if (sscanf(buf, "%d", &new_value) != 1) {
|
||||
pr_err(DRV_NAME
|
||||
": %s: no num_unsol_na value specified.\n",
|
||||
pr_err("%s: no num_unsol_na value specified.\n",
|
||||
bond->dev->name);
|
||||
ret = -EINVAL;
|
||||
goto out;
|
||||
}
|
||||
|
||||
if (new_value < 0 || new_value > 255) {
|
||||
pr_err(DRV_NAME
|
||||
": %s: Invalid num_unsol_na value %d not in range 0-255; rejected.\n",
|
||||
pr_err("%s: Invalid num_unsol_na value %d not in range 0-255; rejected.\n",
|
||||
bond->dev->name, new_value);
|
||||
ret = -EINVAL;
|
||||
goto out;
|
||||
|
@ -1075,40 +1023,31 @@ static ssize_t bonding_store_miimon(struct device *d,
|
|||
struct bonding *bond = to_bond(d);
|
||||
|
||||
if (sscanf(buf, "%d", &new_value) != 1) {
|
||||
pr_err(DRV_NAME
|
||||
": %s: no miimon value specified.\n",
|
||||
pr_err("%s: no miimon value specified.\n",
|
||||
bond->dev->name);
|
||||
ret = -EINVAL;
|
||||
goto out;
|
||||
}
|
||||
if (new_value < 0) {
|
||||
pr_err(DRV_NAME
|
||||
": %s: Invalid miimon value %d not in range %d-%d; rejected.\n",
|
||||
pr_err("%s: Invalid miimon value %d not in range %d-%d; rejected.\n",
|
||||
bond->dev->name, new_value, 1, INT_MAX);
|
||||
ret = -EINVAL;
|
||||
goto out;
|
||||
} else {
|
||||
pr_info(DRV_NAME
|
||||
": %s: Setting MII monitoring interval to %d.\n",
|
||||
bond->dev->name, new_value);
|
||||
pr_info("%s: Setting MII monitoring interval to %d.\n",
|
||||
bond->dev->name, new_value);
|
||||
bond->params.miimon = new_value;
|
||||
if (bond->params.updelay)
|
||||
pr_info(DRV_NAME
|
||||
": %s: Note: Updating updelay (to %d) "
|
||||
"since it is a multiple of the miimon value.\n",
|
||||
bond->dev->name,
|
||||
bond->params.updelay * bond->params.miimon);
|
||||
pr_info("%s: Note: Updating updelay (to %d) since it is a multiple of the miimon value.\n",
|
||||
bond->dev->name,
|
||||
bond->params.updelay * bond->params.miimon);
|
||||
if (bond->params.downdelay)
|
||||
pr_info(DRV_NAME
|
||||
": %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);
|
||||
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);
|
||||
if (bond->params.arp_interval) {
|
||||
pr_info(DRV_NAME
|
||||
": %s: MII monitoring cannot be used with "
|
||||
"ARP monitoring. Disabling ARP monitoring...\n",
|
||||
bond->dev->name);
|
||||
pr_info("%s: MII monitoring cannot be used with ARP monitoring. Disabling ARP monitoring...\n",
|
||||
bond->dev->name);
|
||||
bond->params.arp_interval = 0;
|
||||
bond->dev->priv_flags &= ~IFF_MASTER_ARPMON;
|
||||
if (bond->params.arp_validate) {
|
||||
|
@ -1176,17 +1115,15 @@ static ssize_t bonding_store_primary(struct device *d,
|
|||
write_lock_bh(&bond->curr_slave_lock);
|
||||
|
||||
if (!USES_PRIMARY(bond->params.mode)) {
|
||||
pr_info(DRV_NAME
|
||||
": %s: Unable to set primary slave; %s is in mode %d\n",
|
||||
bond->dev->name, bond->dev->name, bond->params.mode);
|
||||
pr_info("%s: Unable to set primary slave; %s is in mode %d\n",
|
||||
bond->dev->name, bond->dev->name, bond->params.mode);
|
||||
} else {
|
||||
bond_for_each_slave(bond, slave, i) {
|
||||
if (strnicmp
|
||||
(slave->dev->name, buf,
|
||||
strlen(slave->dev->name)) == 0) {
|
||||
pr_info(DRV_NAME
|
||||
": %s: Setting %s as primary slave.\n",
|
||||
bond->dev->name, slave->dev->name);
|
||||
pr_info("%s: Setting %s as primary slave.\n",
|
||||
bond->dev->name, slave->dev->name);
|
||||
bond->primary_slave = slave;
|
||||
strcpy(bond->params.primary, slave->dev->name);
|
||||
bond_select_active_slave(bond);
|
||||
|
@ -1197,15 +1134,13 @@ static ssize_t bonding_store_primary(struct device *d,
|
|||
/* if we got here, then we didn't match the name of any slave */
|
||||
|
||||
if (strlen(buf) == 0 || buf[0] == '\n') {
|
||||
pr_info(DRV_NAME
|
||||
": %s: Setting primary slave to None.\n",
|
||||
bond->dev->name);
|
||||
pr_info("%s: Setting primary slave to None.\n",
|
||||
bond->dev->name);
|
||||
bond->primary_slave = NULL;
|
||||
bond_select_active_slave(bond);
|
||||
} else {
|
||||
pr_info(DRV_NAME
|
||||
": %s: Unable to set %.*s as primary slave as it is not a slave.\n",
|
||||
bond->dev->name, (int)strlen(buf) - 1, buf);
|
||||
pr_info("%s: Unable to set %.*s as primary slave as it is not a slave.\n",
|
||||
bond->dev->name, (int)strlen(buf) - 1, buf);
|
||||
}
|
||||
}
|
||||
out:
|
||||
|
@ -1244,8 +1179,7 @@ static ssize_t bonding_store_primary_reselect(struct device *d,
|
|||
|
||||
new_value = bond_parse_parm(buf, pri_reselect_tbl);
|
||||
if (new_value < 0) {
|
||||
pr_err(DRV_NAME
|
||||
": %s: Ignoring invalid primary_reselect value %.*s.\n",
|
||||
pr_err("%s: Ignoring invalid primary_reselect value %.*s.\n",
|
||||
bond->dev->name,
|
||||
(int) strlen(buf) - 1, buf);
|
||||
ret = -EINVAL;
|
||||
|
@ -1253,7 +1187,7 @@ static ssize_t bonding_store_primary_reselect(struct device *d,
|
|||
}
|
||||
|
||||
bond->params.primary_reselect = new_value;
|
||||
pr_info(DRV_NAME ": %s: setting primary_reselect to %s (%d).\n",
|
||||
pr_info("%s: setting primary_reselect to %s (%d).\n",
|
||||
bond->dev->name, pri_reselect_tbl[new_value].modename,
|
||||
new_value);
|
||||
|
||||
|
@ -1291,20 +1225,18 @@ static ssize_t bonding_store_carrier(struct device *d,
|
|||
|
||||
|
||||
if (sscanf(buf, "%d", &new_value) != 1) {
|
||||
pr_err(DRV_NAME
|
||||
": %s: no use_carrier value specified.\n",
|
||||
pr_err("%s: no use_carrier value specified.\n",
|
||||
bond->dev->name);
|
||||
ret = -EINVAL;
|
||||
goto out;
|
||||
}
|
||||
if ((new_value == 0) || (new_value == 1)) {
|
||||
bond->params.use_carrier = new_value;
|
||||
pr_info(DRV_NAME ": %s: Setting use_carrier to %d.\n",
|
||||
bond->dev->name, new_value);
|
||||
pr_info("%s: Setting use_carrier to %d.\n",
|
||||
bond->dev->name, new_value);
|
||||
} else {
|
||||
pr_info(DRV_NAME
|
||||
": %s: Ignoring invalid use_carrier value %d.\n",
|
||||
bond->dev->name, new_value);
|
||||
pr_info("%s: Ignoring invalid use_carrier value %d.\n",
|
||||
bond->dev->name, new_value);
|
||||
}
|
||||
out:
|
||||
return count;
|
||||
|
@ -1349,8 +1281,7 @@ static ssize_t bonding_store_active_slave(struct device *d,
|
|||
write_lock_bh(&bond->curr_slave_lock);
|
||||
|
||||
if (!USES_PRIMARY(bond->params.mode))
|
||||
pr_info(DRV_NAME ": %s: Unable to change active slave;"
|
||||
" %s is in mode %d\n",
|
||||
pr_info("%s: Unable to change active slave; %s is in mode %d\n",
|
||||
bond->dev->name, bond->dev->name, bond->params.mode);
|
||||
else {
|
||||
bond_for_each_slave(bond, slave, i) {
|
||||
|
@ -1361,9 +1292,9 @@ static ssize_t bonding_store_active_slave(struct device *d,
|
|||
new_active = slave;
|
||||
if (new_active == old_active) {
|
||||
/* do nothing */
|
||||
pr_info(DRV_NAME
|
||||
": %s: %s is already the current active slave.\n",
|
||||
bond->dev->name, slave->dev->name);
|
||||
pr_info("%s: %s is already the current active slave.\n",
|
||||
bond->dev->name,
|
||||
slave->dev->name);
|
||||
goto out;
|
||||
}
|
||||
else {
|
||||
|
@ -1371,16 +1302,15 @@ static ssize_t bonding_store_active_slave(struct device *d,
|
|||
(old_active) &&
|
||||
(new_active->link == BOND_LINK_UP) &&
|
||||
IS_UP(new_active->dev)) {
|
||||
pr_info(DRV_NAME
|
||||
": %s: Setting %s as active slave.\n",
|
||||
bond->dev->name, slave->dev->name);
|
||||
pr_info("%s: Setting %s as active slave.\n",
|
||||
bond->dev->name,
|
||||
slave->dev->name);
|
||||
bond_change_active_slave(bond, new_active);
|
||||
}
|
||||
else {
|
||||
pr_info(DRV_NAME
|
||||
": %s: Could not set %s as active slave; "
|
||||
"either %s is down or the link is down.\n",
|
||||
bond->dev->name, slave->dev->name,
|
||||
pr_info("%s: Could not set %s as active slave; either %s is down or the link is down.\n",
|
||||
bond->dev->name,
|
||||
slave->dev->name,
|
||||
slave->dev->name);
|
||||
}
|
||||
goto out;
|
||||
|
@ -1391,14 +1321,12 @@ static ssize_t bonding_store_active_slave(struct device *d,
|
|||
/* if we got here, then we didn't match the name of any slave */
|
||||
|
||||
if (strlen(buf) == 0 || buf[0] == '\n') {
|
||||
pr_info(DRV_NAME
|
||||
": %s: Setting active slave to None.\n",
|
||||
pr_info("%s: Setting active slave to None.\n",
|
||||
bond->dev->name);
|
||||
bond->primary_slave = NULL;
|
||||
bond_select_active_slave(bond);
|
||||
} else {
|
||||
pr_info(DRV_NAME ": %s: Unable to set %.*s"
|
||||
" as active slave as it is not a slave.\n",
|
||||
pr_info("%s: Unable to set %.*s as active slave as it is not a slave.\n",
|
||||
bond->dev->name, (int)strlen(buf) - 1, buf);
|
||||
}
|
||||
}
|
||||
|
@ -1600,8 +1528,7 @@ int bond_create_sysfs(void)
|
|||
/* Is someone being kinky and naming a device bonding_master? */
|
||||
if (__dev_get_by_name(&init_net,
|
||||
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",
|
||||
class_attr_bonding_masters.attr.name);
|
||||
ret = 0;
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue