Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 266867
b: refs/heads/master
c: d5edf29
h: refs/heads/master
i:
  266865: c2f7030
  266863: bbecfcb
v: v3
  • Loading branch information
Flavio Leitner authored and David S. Miller committed Oct 19, 2011
1 parent 2264ad4 commit 7c77f54
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 8 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 4dc360c5e7e155373bffbb3c1f7ea0022dee650c
refs/heads/master: d5edf2906e0a251ddddd76caeb1b79de8bb5e3b8
7 changes: 0 additions & 7 deletions trunk/drivers/net/bonding/bond_3ad.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit 7c77f54

Please sign in to comment.