Commit ed3587fa authored by Veaceslav Falico's avatar Veaceslav Falico Committed by David S. Miller
Browse files

bonding: convert 3ad to use pr_warn instead of pr_warning 



CC: Jay Vosburgh <fubar@us.ibm.com>
CC: Andy Gospodarek <andy@greyhouse.net>
Signed-off-by: default avatarVeaceslav Falico <vfalico@redhat.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 3bf2d28a

drivers/net/bonding/bond_3ad.c

+25 −25
Original line number Diff line number Diff line
@@ -1318,7 +1318,7 @@ 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_warning("%s: Warning: Port %d (on %s) was related to aggregator %d but was not on its port list\n",

			pr_warn("%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,
@@ -1479,7 +1479,7 @@ static struct aggregator *ad_agg_selection_test(struct aggregator *best, 
		break;



	default:

		pr_warning("%s: Impossible agg select mode %d\n",

		pr_warn("%s: Impossible agg select mode %d\n",

			curr->slave->bond->dev->name,

			__get_agg_selection_mode(curr->lag_ports));

		break;
@@ -1594,7 +1594,7 @@ static void ad_agg_selection_logic(struct aggregator *agg) 


		/* check if any partner replys */

		if (best->is_individual) {

			pr_warning("%s: Warning: No 802.3ad response from the link partner for any adapters in the bond\n",

			pr_warn("%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");

		}
@@ -1986,7 +1986,7 @@ void bond_3ad_unbind_slave(struct slave *slave) 


	/* if slave is null, the whole port is not initialized */

	if (!port->slave) {

		pr_warning("Warning: %s: Trying to unbind an uninitialized port on %s\n",

		pr_warn("Warning: %s: Trying to unbind an uninitialized port on %s\n",

			slave->bond->dev->name, slave->dev->name);

		return;

	}
@@ -2064,7 +2064,7 @@ void bond_3ad_unbind_slave(struct slave *slave) 
				if (select_new_active_agg)

					ad_agg_selection_logic(__get_first_agg(port));

			} else {

				pr_warning("%s: Warning: unbinding aggregator, and could not find a new aggregator for its ports\n",

				pr_warn("%s: Warning: unbinding aggregator, and could not find a new aggregator for its ports\n",

					slave->bond->dev->name);

			}

		} else {
@@ -2158,7 +2158,7 @@ void bond_3ad_state_machine_handler(struct work_struct *work) 
		/* select the active aggregator for the bond */

		if (port) {

			if (!port->slave) {

				pr_warning("%s: Warning: bond's first port is uninitialized\n",

				pr_warn("%s: Warning: bond's first port is uninitialized\n",

					bond->dev->name);

				goto re_arm;

			}
@@ -2173,7 +2173,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_warning("%s: Warning: Found an uninitialized port\n",

			pr_warn("%s: Warning: Found an uninitialized port\n",

				bond->dev->name);

			goto re_arm;

		}
@@ -2224,7 +2224,7 @@ static int bond_3ad_rx_indication(struct lacpdu *lacpdu, struct slave *slave, 
		port = &(SLAVE_AD_INFO(slave).port);



		if (!port->slave) {

			pr_warning("%s: Warning: port of slave %s is uninitialized\n",

			pr_warn("%s: Warning: port of slave %s is uninitialized\n",

				slave->dev->name, slave->bond->dev->name);

			return ret;

		}
@@ -2282,7 +2282,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("Warning: %s: speed changed for uninitialized port on %s\n",

		pr_warn("Warning: %s: speed changed for uninitialized port on %s\n",

			slave->bond->dev->name, slave->dev->name);

		return;

	}
@@ -2315,7 +2315,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("%s: Warning: duplex changed for uninitialized port on %s\n",

		pr_warn("%s: Warning: duplex changed for uninitialized port on %s\n",

			slave->bond->dev->name, slave->dev->name);

		return;

	}
@@ -2349,7 +2349,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("Warning: %s: link status changed for uninitialized port on %s\n",

		pr_warn("Warning: %s: link status changed for uninitialized port on %s\n",

			slave->bond->dev->name, slave->dev->name);

		return;

	}