svn commit: r313039 - stable/10/sys/net

[Ravi Pokala]

Author: rpokala
Date: Wed Feb  1 04:54:23 2017
New Revision: 313039
URL: https://svnweb.freebsd.org/changeset/base/313039

Log:
  MFC r312678: Eliminate misleading comments and dead code in
  lacp_port_create()
  
  Variables "fast" and "active" are both constant in lacp_port_create(), but
  comments mispleadingly suggest that "fast" can be changed via ioctl. The
  constant values control the value of "lp->lp_state", so it too is constant,
  and the code for assigning different value to it is essentially dead.
  
  Remove both "fast" and "active", and set "lp->lp_state" unconditionally;
  that gets rid of the dead code and misleading comments.

Modified:
  stable/10/sys/net/ieee8023ad_lacp.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/net/ieee8023ad_lacp.c
==============================================================================
--- stable/10/sys/net/ieee8023ad_lacp.c	Wed Feb  1 04:53:52 2017	(r313038)
+++ stable/10/sys/net/ieee8023ad_lacp.c	Wed Feb  1 04:54:23 2017	(r313039)
@@ -523,9 +523,6 @@ lacp_port_create(struct lagg_port *lgp)
 	struct ifmultiaddr *rifma = NULL;
 	int error;
 
-	boolean_t active = TRUE; /* XXX should be configurable */
-	boolean_t fast = FALSE; /* Configurable via ioctl */ 
-
 	bzero((char *)&sdl, sizeof(sdl));
 	sdl.sdl_len = sizeof(sdl);
 	sdl.sdl_family = AF_LINK;
@@ -557,9 +554,7 @@ lacp_port_create(struct lagg_port *lgp)
 
 	lacp_fill_actorinfo(lp, &lp->lp_actor);
 	lacp_fill_markerinfo(lp, &lp->lp_marker);
-	lp->lp_state =
-	    (active ? LACP_STATE_ACTIVITY : 0) |
-	    (fast ? LACP_STATE_TIMEOUT : 0);
+	lp->lp_state = LACP_STATE_ACTIVITY;
 	lp->lp_aggregator = NULL;
 	lacp_sm_rx_set_expired(lp);
 	LACP_UNLOCK(lsc);