1 files changed, 154 insertions, 140 deletions

diff --git a/drivers/net/bonding/bond_3ad.c b/drivers/net/bonding/bond_3ad.c
index c3fa31c9f2a7..822f586d72af 100644
--- a/drivers/net/bonding/bond_3ad.c
+++ b/drivers/net/bonding/bond_3ad.c
@@ -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;
                 }
         }
@@ -446,6 +451,48 @@ static u16 __ad_timer_to_ticks(u16 timer_type, u16 par)
 /////////////////////////////////////////////////////////////////////////////////
 
 /**
+ * __choose_matched - update a port's matched variable from a received lacpdu
+ * @lacpdu: the lacpdu we've received
+ * @port: the port we're looking at
+ *
+ * Update the value of the matched variable, using parameter values from a
+ * newly received lacpdu. Parameter values for the partner carried in the
+ * received PDU are compared with the corresponding operational parameter
+ * values for the actor. Matched is set to TRUE if all of these parameters
+ * match and the PDU parameter partner_state.aggregation has the same value as
+ * actor_oper_port_state.aggregation and lacp will actively maintain the link
+ * in the aggregation. Matched is also set to TRUE if the value of
+ * actor_state.aggregation in the received PDU is set to FALSE, i.e., indicates
+ * an individual link and lacp will actively maintain the link. Otherwise,
+ * matched is set to FALSE. LACP is considered to be actively maintaining the
+ * link if either the PDU's actor_state.lacp_activity variable is TRUE or both
+ * the actor's actor_oper_port_state.lacp_activity and the PDU's
+ * partner_state.lacp_activity variables are TRUE.
+ *
+ * Note: the AD_PORT_MATCHED "variable" is not specified by 802.3ad; it is
+ * used here to implement the language from 802.3ad 43.4.9 that requires
+ * recordPDU to "match" the LACPDU parameters to the stored values.
+ */
+static void __choose_matched(struct lacpdu *lacpdu, struct port *port)
+{
+        // check if all parameters are alike
+        if (((ntohs(lacpdu->partner_port) == port->actor_port_number) &&
+             (ntohs(lacpdu->partner_port_priority) == port->actor_port_priority) &&
+             !MAC_ADDRESS_COMPARE(&(lacpdu->partner_system), &(port->actor_system)) &&
+             (ntohs(lacpdu->partner_system_priority) == port->actor_system_priority) &&
+             (ntohs(lacpdu->partner_key) == port->actor_oper_port_key) &&
+             ((lacpdu->partner_state & AD_STATE_AGGREGATION) == (port->actor_oper_port_state & AD_STATE_AGGREGATION))) ||
+            // or this is individual link(aggregation == FALSE)
+            ((lacpdu->actor_state & AD_STATE_AGGREGATION) == 0)
+                ) {
+                // update the state machine Matched variable
+                port->sm_vars |= AD_PORT_MATCHED;
+        } else {
+                port->sm_vars &= ~AD_PORT_MATCHED;
+        }
+}
+
+/**
  * __record_pdu - record parameters from a received lacpdu
  * @lacpdu: the lacpdu we've received
  * @port: the port we're looking at
@@ -459,6 +506,7 @@ static void __record_pdu(struct lacpdu *lacpdu, struct port *port)
         if (lacpdu && port) {
                 struct port_params *partner = &port->partner_oper;
 
+                __choose_matched(lacpdu, port);
                 // record the new parameter values for the partner operational
                 partner->port_number = ntohs(lacpdu->actor_port);
                 partner->port_priority = ntohs(lacpdu->actor_port_priority);
@@ -518,12 +566,12 @@ static void __update_selected(struct lacpdu *lacpdu, struct port *port)
                 const struct port_params *partner = &port->partner_oper;
 
                 // check if any parameter is different
-                if (ntohs(lacpdu->actor_port) != partner->port_number
-                    || ntohs(lacpdu->actor_port_priority) != partner->port_priority
-                    || MAC_ADDRESS_COMPARE(&lacpdu->actor_system, &partner->system)
-                    || ntohs(lacpdu->actor_system_priority) != partner->system_priority
-                    || ntohs(lacpdu->actor_key) != partner->key
-                    || (lacpdu->actor_state & AD_STATE_AGGREGATION) != (partner->port_state & AD_STATE_AGGREGATION)) {
+                if (ntohs(lacpdu->actor_port) != partner->port_number ||
+                    ntohs(lacpdu->actor_port_priority) != partner->port_priority ||
+                    MAC_ADDRESS_COMPARE(&lacpdu->actor_system, &partner->system) ||
+                    ntohs(lacpdu->actor_system_priority) != partner->system_priority ||
+                    ntohs(lacpdu->actor_key) != partner->key ||
+                    (lacpdu->actor_state & AD_STATE_AGGREGATION) != (partner->port_state & AD_STATE_AGGREGATION)) {
                         // update the state machine Selected variable
                         port->sm_vars &= ~AD_PORT_SELECTED;
                 }
@@ -549,12 +597,12 @@ static void __update_default_selected(struct port *port)
                 const struct port_params *oper = &port->partner_oper;
 
                 // check if any parameter is different
-                if (admin->port_number != oper->port_number
-                    || admin->port_priority != oper->port_priority
-                    || MAC_ADDRESS_COMPARE(&admin->system, &oper->system)
-                    || admin->system_priority != oper->system_priority
-                    || admin->key != oper->key
-                    || (admin->port_state & AD_STATE_AGGREGATION)
+                if (admin->port_number != oper->port_number ||
+                    admin->port_priority != oper->port_priority ||
+                    MAC_ADDRESS_COMPARE(&admin->system, &oper->system) ||
+                    admin->system_priority != oper->system_priority ||
+                    admin->key != oper->key ||
+                    (admin->port_state & AD_STATE_AGGREGATION)
                         != (oper->port_state & AD_STATE_AGGREGATION)) {
                         // update the state machine Selected variable
                         port->sm_vars &= ~AD_PORT_SELECTED;
@@ -563,47 +611,6 @@ static void __update_default_selected(struct port *port)
 }
 
 /**
- * __choose_matched - update a port's matched variable from a received lacpdu
- * @lacpdu: the lacpdu we've received
- * @port: the port we're looking at
- *
- * Update the value of the matched variable, using parameter values from a
- * newly received lacpdu. Parameter values for the partner carried in the
- * received PDU are compared with the corresponding operational parameter
- * values for the actor. Matched is set to TRUE if all of these parameters
- * match and the PDU parameter partner_state.aggregation has the same value as
- * actor_oper_port_state.aggregation and lacp will actively maintain the link
- * in the aggregation. Matched is also set to TRUE if the value of
- * actor_state.aggregation in the received PDU is set to FALSE, i.e., indicates
- * an individual link and lacp will actively maintain the link. Otherwise,
- * matched is set to FALSE. LACP is considered to be actively maintaining the
- * link if either the PDU's actor_state.lacp_activity variable is TRUE or both
- * the actor's actor_oper_port_state.lacp_activity and the PDU's
- * partner_state.lacp_activity variables are TRUE.
- */
-static void __choose_matched(struct lacpdu *lacpdu, struct port *port)
-{
-        // validate lacpdu and port
-        if (lacpdu && port) {
-                // check if all parameters are alike
-                if (((ntohs(lacpdu->partner_port) == port->actor_port_number) &&
-                     (ntohs(lacpdu->partner_port_priority) == port->actor_port_priority) &&
-                     !MAC_ADDRESS_COMPARE(&(lacpdu->partner_system), &(port->actor_system)) &&
-                     (ntohs(lacpdu->partner_system_priority) == port->actor_system_priority) &&
-                     (ntohs(lacpdu->partner_key) == port->actor_oper_port_key) &&
-                     ((lacpdu->partner_state & AD_STATE_AGGREGATION) == (port->actor_oper_port_state & AD_STATE_AGGREGATION))) ||
-                    // or this is individual link(aggregation == FALSE)
-                    ((lacpdu->actor_state & AD_STATE_AGGREGATION) == 0)
-                   ) {
-                        // update the state machine Matched variable
-                        port->sm_vars |= AD_PORT_MATCHED;
-                } else {
-                        port->sm_vars &= ~AD_PORT_MATCHED;
-                }
-        }
-}
-
-/**
  * __update_ntt - update a port's ntt variable from a received lacpdu
  * @lacpdu: the lacpdu we've received
  * @port: the port we're looking at
@@ -978,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);
@@ -1077,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)) {
@@ -1124,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;
@@ -1134,7 +1144,6 @@ static void ad_rx_machine(struct lacpdu *lacpdu, struct port *port)
                         __update_selected(lacpdu, port);
                         __update_ntt(lacpdu, port);
                         __record_pdu(lacpdu, port);
-                        __choose_matched(lacpdu, port);
                         port->sm_rx_timer_counter = __ad_timer_to_ticks(AD_CURRENT_WHILE_TIMER, (u16)(port->actor_oper_port_state & AD_STATE_LACP_TIMEOUT));
                         port->actor_oper_port_state &= ~AD_STATE_EXPIRED;
                         // verify that if the aggregator is enabled, the port is enabled too.
@@ -1165,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 */
@@ -1240,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
@@ -1297,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);
@@ -1306,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,
@@ -1342,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;
@@ -1379,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);
                 }
@@ -1459,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;
@@ -1545,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 ? best->slave->dev->master->name : "NULL");
                 }
 
                 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) {
@@ -1632,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);
         }
 }
 
@@ -1727,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);
         }
 }
@@ -1740,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);
         }
 }
@@ -1778,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
@@ -1802,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);
         }
 }
 
@@ -1888,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;
         }
@@ -1956,7 +1974,7 @@ void bond_3ad_unbind_slave(struct slave *slave)
         struct port *port, *prev_port, *temp_port;
         struct aggregator *aggregator, *new_aggregator, *temp_aggregator;
         int select_new_active_agg = 0;
-        
+
         // find the aggregator related to this slave
         aggregator = &(SLAVE_AD_INFO(slave).aggregator);
 
@@ -1965,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;
@@ -1995,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;
@@ -2024,13 +2044,12 @@ void bond_3ad_unbind_slave(struct slave *slave)
 
                                 // clear the aggregator
                                 ad_clear_agg(aggregator);
-                                
+
                                 if (select_new_active_agg) {
                                         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
@@ -2038,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));
@@ -2065,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));
@@ -2075,7 +2094,7 @@ void bond_3ad_unbind_slave(struct slave *slave)
                         }
                 }
         }
-        port->slave=NULL;       
+        port->slave=NULL;
 }
 
 /**
@@ -2114,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;
                         }
 
@@ -2128,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;
                 }
 
@@ -2170,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;
 
@@ -2187,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);
                         }
                 }
         }
@@ -2217,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;
         }
@@ -2245,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;
         }
@@ -2274,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;
         }
@@ -2301,7 +2320,7 @@ void bond_3ad_handle_link_change(struct slave *slave, char link)
 }
 
 /*
- * set link state for bonding master: if we have an active 
+ * set link state for bonding master: if we have an active
  * aggregator, we're up, if not, we're down.  Presumes that we cannot
  * have an active aggregator if there are no slaves with link up.
  *
@@ -2380,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;
         }
 
@@ -2390,12 +2409,11 @@ 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;
         }
 
-        slave_agg_no = bond->xmit_hash_policy(skb, dev, slaves_in_agg);
+        slave_agg_no = bond->xmit_hash_policy(skb, slaves_in_agg);
 
         bond_for_each_slave(bond, slave, i) {
                 struct aggregator *agg = SLAVE_AD_INFO(slave).port.aggregator;
@@ -2409,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;
         }
 
@@ -2445,9 +2463,6 @@ int bond_3ad_lacpdu_recv(struct sk_buff *skb, struct net_device *dev, struct pac
         struct slave *slave = NULL;
         int ret = NET_RX_DROP;
 
-        if (dev_net(dev) != &init_net)
-                goto out;
-
         if (!(dev->flags & IFF_MASTER))
                 goto out;
 
@@ -2468,4 +2483,3 @@ out:
 
         return ret;
 }
-