1 files changed, 3 insertions, 2 deletions

diff --git a/drivers/net/bonding/bond_3ad.c b/drivers/net/bonding/bond_3ad.c
index d4b570886c6e..be799d2a8a8d 100644
--- a/drivers/net/bonding/bond_3ad.c
+++ b/drivers/net/bonding/bond_3ad.c
@@ -1109,7 +1109,8 @@ static void ad_rx_machine(struct lacpdu *lacpdu, struct port *port)
                         //mux machine in case of EXPIRED even if LINK_DOWN didn't arrive for the port.
                         port->partner_oper.port_state &= ~AD_STATE_SYNCHRONIZATION;
                         port->sm_vars &= ~AD_PORT_MATCHED;
-                        port->partner_oper.port_state |= AD_SHORT_TIMEOUT;
+                        port->partner_oper.port_state |=
+                                AD_STATE_LACP_ACTIVITY;
                         port->sm_rx_timer_counter = __ad_timer_to_ticks(AD_CURRENT_WHILE_TIMER, (u16)(AD_SHORT_TIMEOUT));
                         port->actor_oper_port_state |= AD_STATE_EXPIRED;
                         break;
@@ -2431,7 +2432,7 @@ out:
                 dev_kfree_skb(skb);
         }
         read_unlock(&bond->lock);
-        return 0;
+        return NETDEV_TX_OK;
 }
 
 int bond_3ad_lacpdu_recv(struct sk_buff *skb, struct net_device *dev, struct packet_type* ptype, struct net_device *orig_dev)