bonding: Remove unnecessary initialization

bond_3ad_bind_slave() calls ad_initialize_port() and then immediately
assigns correct values making some of that initialization unnecessary.

Signed-off-by: Mahesh Bandewar <maheshb@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/bonding/bond_3ad.c b/drivers/net/bonding/bond_3ad.c
index 245d0db5871d03e555ddf9f6b5d3b6236d4120b0..fbd54f0e32e8d7baf7e1f2de3c5155201aeccfea 100644 (file)
--- a/drivers/net/bonding/bond_3ad.c
+++ b/drivers/net/bonding/bond_3ad.c
@@ -1757,14 +1757,9 @@ static void ad_initialize_port(struct port *port, int lacp_fast)
        };
 
        if (port) {
-               port->actor_port_number = 1;
                port->actor_port_priority = 0xff;
-               port->actor_system = null_mac_addr;
-               port->actor_system_priority = 0xffff;
                port->actor_port_aggregator_identifier = 0;
                port->ntt = false;
-               port->actor_admin_port_key = 1;
-               port->actor_oper_port_key  = 1;
                port->actor_admin_port_state = AD_STATE_AGGREGATION |
                                               AD_STATE_LACP_ACTIVITY;
                port->actor_oper_port_state  = AD_STATE_AGGREGATION |
@@ -1786,8 +1781,6 @@ static void ad_initialize_port(struct port *port, int lacp_fast)
                port->sm_mux_state = 0;
                port->sm_mux_timer_counter = 0;
                port->sm_tx_state = 0;
-               port->sm_tx_timer_counter = 0;
-               port->slave = NULL;
                port->aggregator = NULL;
                port->next_port_in_aggregator = NULL;
                port->transaction_id = 0;
@@ -1970,8 +1963,6 @@ void bond_3ad_bind_slave(struct slave *slave)
                 * lacpdu's are sent in one second)
                 */
                port->sm_tx_timer_counter = ad_ticks_per_sec/AD_MAX_TX_IN_SECOND;
-               port->aggregator = NULL;
-               port->next_port_in_aggregator = NULL;
 
                __disable_port(port);