svn commit: r319695 - stable/11/sys/net

[Alexander Motin]

Author: mav
Date: Thu Jun  8 14:32:42 2017
New Revision: 319695
URL: https://svnweb.freebsd.org/changeset/base/319695

Log:
  MFC r318907: Remove some code, dead from the day one.
  
  Approved by:	re (marius)

Modified:
  stable/11/sys/net/if_lagg.c
  stable/11/sys/net/if_lagg.h
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/sys/net/if_lagg.c
==============================================================================
--- stable/11/sys/net/if_lagg.c	Thu Jun  8 13:04:01 2017	(r319694)
+++ stable/11/sys/net/if_lagg.c	Thu Jun  8 14:32:42 2017	(r319695)
@@ -1716,7 +1716,6 @@ struct lagg_port *
 lagg_link_active(struct lagg_softc *sc, struct lagg_port *lp)
 {
 	struct lagg_port *lp_next, *rval = NULL;
-	// int new_link = LINK_STATE_DOWN;
 
 	/*
 	 * Search a port which reports an active link state.
@@ -1743,22 +1742,6 @@ search:
 	}
 
 found:
-	if (rval != NULL) {
-		/*
-		 * The IEEE 802.1D standard assumes that a lagg with
-		 * multiple ports is always full duplex. This is valid
-		 * for load sharing laggs and if at least two links
-		 * are active. Unfortunately, checking the latter would
-		 * be too expensive at this point.
-		 XXX
-		if ((sc->sc_capabilities & IFCAP_LAGG_FULLDUPLEX) &&
-		    (sc->sc_count > 1))
-			new_link = LINK_STATE_FULL_DUPLEX;
-		else
-			new_link = rval->lp_link_state;
-		 */
-	}
-
 	return (rval);
 }
 
@@ -1775,7 +1758,6 @@ lagg_enqueue(struct ifnet *ifp, struct mbuf *m)
 static void
 lagg_rr_attach(struct lagg_softc *sc)
 {
-	sc->sc_capabilities = IFCAP_LAGG_FULLDUPLEX;
 	sc->sc_seq = 0;
 	sc->sc_bkt_count = sc->sc_bkt;
 }
@@ -1944,9 +1926,6 @@ lagg_lb_attach(struct lagg_softc *sc)
 	struct lagg_lb *lb;
 
 	lb = malloc(sizeof(struct lagg_lb), M_DEVBUF, M_WAITOK | M_ZERO);
-
-	sc->sc_capabilities = IFCAP_LAGG_FULLDUPLEX;
-
 	lb->lb_key = m_ether_tcpip_hash_init();
 	sc->sc_psc = lb;
 

Modified: stable/11/sys/net/if_lagg.h
==============================================================================
--- stable/11/sys/net/if_lagg.h	Thu Jun  8 13:04:01 2017	(r319694)
+++ stable/11/sys/net/if_lagg.h	Thu Jun  8 14:32:42 2017	(r319695)
@@ -185,10 +185,6 @@ struct lagg_ifreq {
 
 #define	sc_ifflags		sc_ifp->if_flags		/* flags */
 #define	sc_ifname		sc_ifp->if_xname		/* name */
-#define	sc_capabilities		sc_ifp->if_capabilities	/* capabilities */
-
-#define	IFCAP_LAGG_MASK		0xffff0000	/* private capabilities */
-#define	IFCAP_LAGG_FULLDUPLEX	0x00010000	/* full duplex with >1 ports */
 
 /* Private data used by the loadbalancing protocol */
 struct lagg_lb {