drivers/net/bonding/: : use pr_fmt (a4aee5c8) · Commits · 戴 / test

drivers/net/bonding/bond_3ad.c

+94 −77

Original line number	Original line	Diff line number	Diff line
	@@ -20,6 +20,8 @@
	*		*
	*/		*/

			#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt

	#include <linux/skbuff.h>		#include <linux/skbuff.h>
	#include <linux/if_ether.h>		#include <linux/if_ether.h>
	#include <linux/netdevice.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;		return speed;
	}		}

	@@ -378,12 +381,14 @@ static u8 __get_duplex(struct port *port)
	switch (slave->duplex) {		switch (slave->duplex) {
	case DUPLEX_FULL:		case DUPLEX_FULL:
	retval=0x1;		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;		break;
	case DUPLEX_HALF:		case DUPLEX_HALF:
	default:		default:
	retval=0x0;		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;		break;
	}		}
	}		}
	@@ -980,7 +985,9 @@ static void ad_mux_machine(struct port *port)

	// check if the state machine was changed		// check if the state machine was changed
	if (port->sm_mux_state != last_state) {		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) {		switch (port->sm_mux_state) {
	case AD_MUX_DETACHED:		case AD_MUX_DETACHED:
	__detach_bond_from_agg(port);		__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		// check if the State machine was changed or new lacpdu arrived
	if ((port->sm_rx_state != last_state) \|\| (lacpdu)) {		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) {		switch (port->sm_rx_state) {
	case AD_RX_INITIALIZE:		case AD_RX_INITIALIZE:
	if (!(port->actor_oper_port_key & AD_DUPLEX_KEY_BITS)) {		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		// detect loopback situation
	if (!MAC_ADDRESS_COMPARE(&(lacpdu->actor_system), &(port->actor_system))) {		if (!MAC_ADDRESS_COMPARE(&(lacpdu->actor_system), &(port->actor_system))) {
	// INFO_RECEIVED_LOOPBACK_FRAMES		// INFO_RECEIVED_LOOPBACK_FRAMES
	pr_err(DRV_NAME ": %s: An illegal loopback occurred on "		pr_err("%s: An illegal loopback occurred on adapter (%s).\n"
	"adapter (%s). Check the configuration to verify that all "		"Check the configuration to verify that all adapters are connected to 802.3ad compliant switch ports\n",
	"Adapters are connected to 802.3ad compliant switch ports\n",
	port->slave->dev->master->name, port->slave->dev->name);		port->slave->dev->master->name, port->slave->dev->name);
	__release_rx_machine_lock(port);		__release_rx_machine_lock(port);
	return;		return;
	@@ -1166,7 +1174,8 @@ static void ad_tx_machine(struct port *port)
	__update_lacpdu_from_port(port);		__update_lacpdu_from_port(port);

	if (ad_lacpdu_send(port) >= 0) {		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		/* mark ntt as false, so it will not be sent again until
	demanded */		demanded */
	@@ -1241,7 +1250,9 @@ static void ad_periodic_machine(struct port *port)

	// check if the state machine was changed		// check if the state machine was changed
	if (port->sm_periodic_state != last_state) {		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) {		switch (port->sm_periodic_state) {
	case AD_NO_PERIODIC:		case AD_NO_PERIODIC:
	port->sm_periodic_timer_counter = 0; // zero timer		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->next_port_in_aggregator=NULL;
	port->actor_port_aggregator_identifier=0;		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 the aggregator is empty, clear its parameters, and set it ready to be attached
	if (!temp_aggregator->lag_ports) {		if (!temp_aggregator->lag_ports) {
	ad_clear_agg(temp_aggregator);		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		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) "		pr_warning("%s: Warning: Port %d (on %s) was related to aggregator %d but was not on its port list\n",
	"was related to aggregator %d but was not "
	"on its port list\n",
	port->slave->dev->master->name,		port->slave->dev->master->name,
	port->actor_port_number,		port->actor_port_number,
	port->slave->dev->name,		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->next_port_in_aggregator=aggregator->lag_ports;
	port->aggregator->num_of_ports++;		port->aggregator->num_of_ports++;
	aggregator->lag_ports=port;		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		// mark this port as selected
	port->sm_vars \|= AD_PORT_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		// mark this port as selected
	port->sm_vars \|= AD_PORT_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 {		} else {
	pr_err(DRV_NAME ": %s: Port %d (on %s) did not find "		pr_err("%s: Port %d (on %s) did not find a suitable aggregator\n",
	"a suitable aggregator\n",
	port->slave->dev->master->name,		port->slave->dev->master->name,
	port->actor_port_number, port->slave->dev->name);		port->actor_port_number, port->slave->dev->name);
	}		}
	@@ -1460,8 +1474,7 @@ static struct aggregator ad_agg_selection_test(struct aggregator best,
	break;		break;

	default:		default:
	pr_warning(DRV_NAME		pr_warning("%s: Impossible agg select mode %d\n",
	": %s: Impossible agg select mode %d\n",
	curr->slave->dev->master->name,		curr->slave->dev->master->name,
	__get_agg_selection_mode(curr->lag_ports));		__get_agg_selection_mode(curr->lag_ports));
	break;		break;
	@@ -1566,9 +1579,7 @@ static void ad_agg_selection_logic(struct aggregator *agg)

	// check if any partner replys		// check if any partner replys
	if (best->is_individual) {		if (best->is_individual) {
	pr_warning(DRV_NAME ": %s: Warning: No 802.3ad"		pr_warning("%s: Warning: No 802.3ad response from the link partner for any adapters in the bond\n",
	" response from the link partner for any"
	" adapters in the bond\n",
	best->slave->dev->master->name);		best->slave->dev->master->name);
	}		}

	@@ -1633,7 +1644,8 @@ static void ad_clear_agg(struct aggregator *aggregator)
	aggregator->lag_ports = NULL;		aggregator->lag_ports = NULL;
	aggregator->is_active = 0;		aggregator->is_active = 0;
	aggregator->num_of_ports = 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)		static void ad_enable_collecting_distributing(struct port *port)
	{		{
	if (port->aggregator->is_active) {		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);		__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)		static void ad_disable_collecting_distributing(struct port *port)
	{		{
	if (port->aggregator && MAC_ADDRESS_COMPARE(&(port->aggregator->partner_system), &(null_mac_addr))) {		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);		__disable_port(port);
	}		}
	}		}
	@@ -1779,7 +1795,8 @@ static void ad_marker_info_send(struct port *port)

	// send the marker information		// send the marker information
	if (ad_marker_send(port, &marker) >= 0) {		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		#endif
	@@ -1803,7 +1820,8 @@ static void ad_marker_info_received(struct bond_marker *marker_info,
	// send the marker response		// send the marker response

	if (ad_marker_send(port, &marker) >= 0) {		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;		struct aggregator *aggregator;

	if (bond == NULL) {		if (bond == NULL) {
	pr_err(DRV_NAME ": %s: The slave %s is not attached to "		pr_err("%s: The slave %s is not attached to its bond\n",
	"its bond\n",
	slave->dev->master->name, slave->dev->name);		slave->dev->master->name, slave->dev->name);
	return -1;		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 slave is null, the whole port is not initialized
	if (!port->slave) {		if (!port->slave) {
	pr_warning(DRV_NAME ": Warning: %s: Trying to "		pr_warning("Warning: %s: Trying to unbind an uninitialized port on %s\n",
	"unbind an uninitialized port on %s\n",
	slave->dev->master->name, slave->dev->name);		slave->dev->master->name, slave->dev->name);
	return;		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 */		/* Tell the partner that this port is not suitable for aggregation */
	port->actor_oper_port_state &= ~AD_STATE_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		// if new aggregator found, copy the aggregator's parameters
	// and connect the related lag_ports to the new aggregator		// 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))) {		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) {		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);		aggregator->slave->dev->master->name);
	// select new active aggregator		// select new active aggregator
	select_new_active_agg = 1;		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));		ad_agg_selection_logic(__get_first_agg(port));
	}		}
	} else {		} else {
	pr_warning(DRV_NAME ": %s: Warning: unbinding aggregator, "		pr_warning("%s: Warning: unbinding aggregator, and could not find a new aggregator for its ports\n",
	"and could not find a new aggregator for its ports\n",
	slave->dev->master->name);		slave->dev->master->name);
	}		}
	} else { // in case that the only port related to this aggregator is the one we want to remove		} 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		// clear the aggregator
	ad_clear_agg(aggregator);		ad_clear_agg(aggregator);
	if (select_new_active_agg) {		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);		slave->dev->master->name);
	// select new active aggregator		// select new active aggregator
	ad_agg_selection_logic(__get_first_agg(port));		ad_agg_selection_logic(__get_first_agg(port));
	@@ -2066,7 +2084,7 @@ void bond_3ad_unbind_slave(struct slave *slave)
	// clear the aggregator		// clear the aggregator
	ad_clear_agg(temp_aggregator);		ad_clear_agg(temp_aggregator);
	if (select_new_active_agg) {		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);		slave->dev->master->name);
	// select new active aggregator		// select new active aggregator
	ad_agg_selection_logic(__get_first_agg(port));		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		// select the active aggregator for the bond
	if ((port = __get_first_port(bond))) {		if ((port = __get_first_port(bond))) {
	if (!port->slave) {		if (!port->slave) {
	pr_warning(DRV_NAME ": %s: Warning: bond's first port is "		pr_warning("%s: Warning: bond's first port is uninitialized\n",
	"uninitialized\n", bond->dev->name);		bond->dev->name);
	goto re_arm;		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 each port run the state machines
	for (port = __get_first_port(bond); port; port = __get_next_port(port)) {		for (port = __get_first_port(bond); port; port = __get_next_port(port)) {
	if (!port->slave) {		if (!port->slave) {
	pr_warning(DRV_NAME ": %s: Warning: Found an uninitialized "		pr_warning("%s: Warning: Found an uninitialized port\n",
	"port\n", bond->dev->name);		bond->dev->name);
	goto re_arm;		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);		port = &(SLAVE_AD_INFO(slave).port);

	if (!port->slave) {		if (!port->slave) {
	pr_warning(DRV_NAME ": %s: Warning: port of slave %s "		pr_warning("%s: Warning: port of slave %s is uninitialized\n",
	"is uninitialized\n",
	slave->dev->name, slave->dev->master->name);		slave->dev->name, slave->dev->master->name);
	return;		return;
	}		}

	switch (lacpdu->subtype) {		switch (lacpdu->subtype) {
	case AD_TYPE_LACPDU:		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);		ad_rx_machine(lacpdu, port);
	break;		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) {		switch (((struct bond_marker *)lacpdu)->tlv_type) {
	case AD_MARKER_INFORMATION_SUBTYPE:		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);		ad_marker_info_received((struct bond_marker *)lacpdu, port);
	break;		break;

	case AD_MARKER_RESPONSE_SUBTYPE:		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);		ad_marker_response_received((struct bond_marker *)lacpdu, port);
	break;		break;

	default:		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 slave is null, the whole port is not initialized
	if (!port->slave) {		if (!port->slave) {
	pr_warning(DRV_NAME ": Warning: %s: speed "		pr_warning("Warning: %s: speed changed for uninitialized port on %s\n",
	"changed for uninitialized port on %s\n",
	slave->dev->master->name, slave->dev->name);		slave->dev->master->name, slave->dev->name);
	return;		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 slave is null, the whole port is not initialized
	if (!port->slave) {		if (!port->slave) {
	pr_warning(DRV_NAME ": %s: Warning: duplex changed "		pr_warning("%s: Warning: duplex changed for uninitialized port on %s\n",
	"for uninitialized port on %s\n",
	slave->dev->master->name, slave->dev->name);		slave->dev->master->name, slave->dev->name);
	return;		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 slave is null, the whole port is not initialized
	if (!port->slave) {		if (!port->slave) {
	pr_warning(DRV_NAME ": Warning: %s: link status changed for "		pr_warning("Warning: %s: link status changed for uninitialized port on %s\n",
	"uninitialized port on %s\n",
	slave->dev->master->name, slave->dev->name);		slave->dev->master->name, slave->dev->name);
	return;		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)) {		if (bond_3ad_get_active_agg_info(bond, &ad_info)) {
	pr_debug(DRV_NAME ": %s: Error: "		pr_debug("%s: Error: bond_3ad_get_active_agg_info failed\n",
	"bond_3ad_get_active_agg_info failed\n", dev->name);		dev->name);
	goto out;		goto out;
	}		}

	@@ -2391,8 +2409,7 @@ int bond_3ad_xmit_xor(struct sk_buff skb, struct net_device dev)

	if (slaves_in_agg == 0) {		if (slaves_in_agg == 0) {
	/the aggregator is empty/		/the aggregator is empty/
	pr_debug(DRV_NAME ": %s: Error: active aggregator is empty\n",		pr_debug("%s: Error: active aggregator is empty\n", dev->name);
	dev->name);
	goto out;		goto out;
	}		}

	@@ -2410,8 +2427,8 @@ int bond_3ad_xmit_xor(struct sk_buff skb, struct net_device dev)
	}		}

	if (slave_agg_no >= 0) {		if (slave_agg_no >= 0) {
	pr_err(DRV_NAME ": %s: Error: Couldn't find a slave to tx on "		pr_err("%s: Error: Couldn't find a slave to tx on for aggregator ID %d\n",
	"for aggregator ID %d\n", dev->name, agg_id);		dev->name, agg_id);
	goto out;		goto out;
	}		}

drivers/net/bonding/bond_alb.c

+12 −26

Original line number	Original line	Diff line number	Diff line
	@@ -20,6 +20,8 @@
	*		*
	*/		*/

			#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt

	#include <linux/skbuff.h>		#include <linux/skbuff.h>
	#include <linux/netdevice.h>		#include <linux/netdevice.h>
	#include <linux/etherdevice.h>		#include <linux/etherdevice.h>
	@@ -201,8 +203,7 @@ static int tlb_initialize(struct bonding *bond)

	new_hashtbl = kzalloc(size, GFP_KERNEL);		new_hashtbl = kzalloc(size, GFP_KERNEL);
	if (!new_hashtbl) {		if (!new_hashtbl) {
	pr_err(DRV_NAME		pr_err("%s: Error: Failed to allocate TLB hash table\n",
	": %s: Error: Failed to allocate TLB hash table\n",
	bond->dev->name);		bond->dev->name);
	return -1;		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->slave->dev->dev_addr,
	client_info->mac_dst);		client_info->mac_dst);
	if (!skb) {		if (!skb) {
	pr_err(DRV_NAME		pr_err("%s: Error: failed to create an ARP packet\n",
	": %s: Error: failed to create an ARP packet\n",
	client_info->slave->dev->master->name);		client_info->slave->dev->master->name);
	continue;		continue;
	}		}
	@@ -525,8 +525,7 @@ static void rlb_update_client(struct rlb_client_info *client_info)
	if (client_info->tag) {		if (client_info->tag) {
	skb = vlan_put_tag(skb, client_info->vlan_id);		skb = vlan_put_tag(skb, client_info->vlan_id);
	if (!skb) {		if (!skb) {
	pr_err(DRV_NAME		pr_err("%s: Error: failed to insert VLAN tag\n",
	": %s: Error: failed to insert VLAN tag\n",
	client_info->slave->dev->master->name);		client_info->slave->dev->master->name);
	continue;		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]);		client_info = &(bond_info->rx_hashtbl[hash_index]);

	if (!client_info->slave) {		if (!client_info->slave) {
	pr_err(DRV_NAME		pr_err("%s: Error: found a client with no channel in the client's hash table\n",
	": %s: Error: found a client with no channel in "
	"the client's hash table\n",
	bond->dev->name);		bond->dev->name);
	continue;		continue;
	}		}
	@@ -806,8 +803,7 @@ static int rlb_initialize(struct bonding *bond)

	new_hashtbl = kmalloc(size, GFP_KERNEL);		new_hashtbl = kmalloc(size, GFP_KERNEL);
	if (!new_hashtbl) {		if (!new_hashtbl) {
	pr_err(DRV_NAME		pr_err("%s: Error: Failed to allocate RLB hash table\n",
	": %s: Error: Failed to allocate RLB hash table\n",
	bond->dev->name);		bond->dev->name);
	return -1;		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);		skb = vlan_put_tag(skb, vlan->vlan_id);
	if (!skb) {		if (!skb) {
	pr_err(DRV_NAME		pr_err("%s: Error: failed to insert VLAN tag\n",
	": %s: Error: failed to insert VLAN tag\n",
	bond->dev->name);		bond->dev->name);
	continue;		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);		memcpy(s_addr.sa_data, addr, dev->addr_len);
	s_addr.sa_family = dev->type;		s_addr.sa_family = dev->type;
	if (dev_set_mac_address(dev, &s_addr)) {		if (dev_set_mac_address(dev, &s_addr)) {
	pr_err(DRV_NAME		pr_err("%s: Error: dev_set_mac_address of dev %s failed!\n"
	": %s: Error: dev_set_mac_address of dev %s failed! ALB "		"ALB mode requires that the base driver support setting the hw address also when the network device's interface is open\n",
	"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);		dev->master->name, dev->name);
	return -EOPNOTSUPP;		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,		alb_set_slave_mac_addr(slave, free_mac_slave->perm_hwaddr,
	bond->alb_info.rlb_enabled);		bond->alb_info.rlb_enabled);

	pr_warning(DRV_NAME		pr_warning("%s: Warning: the hw address of slave %s is in use by the bond; giving it the hw address of %s\n",
	": %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,		bond->dev->name, slave->dev->name,
	free_mac_slave->dev->name);		free_mac_slave->dev->name);

	} else if (has_bond_addr) {		} else if (has_bond_addr) {
	pr_err(DRV_NAME		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",
	": %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);		bond->dev->name, slave->dev->name);
	return -EFAULT;		return -EFAULT;
	}		}

drivers/net/bonding/bond_ipv6.c

+7 −5

Original line number	Original line	Diff line number	Diff line
	@@ -20,6 +20,8 @@
	*		*
	*/		*/

			#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt

	#include <linux/types.h>		#include <linux/types.h>
	#include <linux/if_vlan.h>		#include <linux/if_vlan.h>
	#include <net/ipv6.h>		#include <net/ipv6.h>
	@@ -80,14 +82,14 @@ static void bond_na_send(struct net_device *slave_dev,
	ND_OPT_TARGET_LL_ADDR);		ND_OPT_TARGET_LL_ADDR);

	if (!skb) {		if (!skb) {
	pr_err(DRV_NAME ": NA packet allocation failed\n");		pr_err("NA packet allocation failed\n");
	return;		return;
	}		}

	if (vlan_id) {		if (vlan_id) {
	skb = vlan_put_tag(skb, vlan_id);		skb = vlan_put_tag(skb, vlan_id);
	if (!skb) {		if (!skb) {
	pr_err(DRV_NAME ": failed to insert VLAN tag\n");		pr_err("failed to insert VLAN tag\n");
	return;		return;
	}		}
	}		}
	@@ -109,8 +111,8 @@ void bond_send_unsolicited_na(struct bonding *bond)
	struct inet6_dev *idev;		struct inet6_dev *idev;
	int is_router;		int is_router;

	pr_debug("bond_send_unsol_na: bond %s slave %s\n", bond->dev->name,		pr_debug("%s: bond %s slave %s\n", bond->dev->name,
	slave ? slave->dev->name : "NULL");		__func__, slave ? slave->dev->name : "NULL");

	if (!slave \|\| !bond->send_unsol_na \|\|		if (!slave \|\| !bond->send_unsol_na \|\|
	test_bit(__LINK_STATE_LINKWATCH_PENDING, &slave->dev->state))		test_bit(__LINK_STATE_LINKWATCH_PENDING, &slave->dev->state))

drivers/net/bonding/bond_main.c

+225 −382

File changed.

Preview size limit exceeded, changes collapsed.

drivers/net/bonding/bond_sysfs.c

+127 −200

File changed.

Preview size limit exceeded, changes collapsed.

Admin message