From 7c77f549666d4bd24cb6beb09d59b1bc2a6592ca Mon Sep 17 00:00:00 2001
From: Flavio Leitner <fbl@redhat.com>
Date: Thu, 13 Oct 2011 07:21:23 +0000
Subject: [PATCH] --- yaml --- r: 266867 b: refs/heads/master c:
 d5edf2906e0a251ddddd76caeb1b79de8bb5e3b8 h: refs/heads/master i:   266865:
 c2f7030a172acb62e93b73c8f59624c56ec9d0f4   266863:
 bbecfcbe64a68f7bc24f03647e9036edbf294117 v: v3

---
 [refs]                               | 2 +-
 trunk/drivers/net/bonding/bond_3ad.c | 7 -------
 2 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/[refs] b/[refs]
index 94eb0906727b..d70e508f148d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4dc360c5e7e155373bffbb3c1f7ea0022dee650c
+refs/heads/master: d5edf2906e0a251ddddd76caeb1b79de8bb5e3b8
diff --git a/trunk/drivers/net/bonding/bond_3ad.c b/trunk/drivers/net/bonding/bond_3ad.c
index 47b928ed08f8..b33c099d65a4 100644
--- a/trunk/drivers/net/bonding/bond_3ad.c
+++ b/trunk/drivers/net/bonding/bond_3ad.c
@@ -1135,13 +1135,6 @@ static void ad_rx_machine(struct lacpdu *lacpdu, struct port *port)
 			__record_pdu(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.
-			//(because if the link goes down for a short time, the 802.3ad will not
-			// catch it, and the port will continue to be disabled)
-			if (port->aggregator
-			    && port->aggregator->is_active
-			    && !__port_is_enabled(port))
-				__enable_port(port);
 			break;
 		default:    //to silence the compiler
 			break;