bonding: improve elaborate port_state assignment

The previous code was just a funny way of assigning both values (they
are both of type u8).

Signed-off-by: Holger Eitzenberger <holger@eitzenberger.org>
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 6f3655d3934f8bd0aae85fead2ffa93b3165d5af..7a108fa24a6d2d98804af685951943cba832e2c7 100644 (file)
--- a/drivers/net/bonding/bond_3ad.c
+++ b/drivers/net/bonding/bond_3ad.c
@@ -491,16 +491,7 @@ static void __record_pdu(struct lacpdu *lacpdu, struct port *port)
                port->partner_oper_system = lacpdu->actor_system;
                port->partner_oper_system_priority = ntohs(lacpdu->actor_system_priority);
                port->partner_oper_key = ntohs(lacpdu->actor_key);
-               // zero partener's lase states
-               port->partner_oper_port_state = 0;
-               port->partner_oper_port_state |= (lacpdu->actor_state & AD_STATE_LACP_ACTIVITY);
-               port->partner_oper_port_state |= (lacpdu->actor_state & AD_STATE_LACP_TIMEOUT);
-               port->partner_oper_port_state |= (lacpdu->actor_state & AD_STATE_AGGREGATION);
-               port->partner_oper_port_state |= (lacpdu->actor_state & AD_STATE_SYNCHRONIZATION);
-               port->partner_oper_port_state |= (lacpdu->actor_state & AD_STATE_COLLECTING);
-               port->partner_oper_port_state |= (lacpdu->actor_state & AD_STATE_DISTRIBUTING);
-               port->partner_oper_port_state |= (lacpdu->actor_state & AD_STATE_DEFAULTED);
-               port->partner_oper_port_state |= (lacpdu->actor_state & AD_STATE_EXPIRED);
+               port->partner_oper_port_state = lacpdu->actor_state;
 
                // set actor_oper_port_state.defaulted to FALSE
                port->actor_oper_port_state &= ~AD_STATE_DEFAULTED;