Skip site navigation (1)Skip section navigation (2) 
Date:      Thu, 25 May 2017 23:19:09 +0000 (UTC)
From:      Alexander Motin <mav@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r318907 - head/sys/net
Message-ID:  <201705252319.v4PNJ9Ps076446@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help 
Author: mav
Date: Thu May 25 23:19:09 2017
New Revision: 318907
URL: https://svnweb.freebsd.org/changeset/base/318907

Log:
  Remove some code, dead from the day one.

Modified:
  head/sys/net/if_lagg.c
  head/sys/net/if_lagg.h

Modified: head/sys/net/if_lagg.c
==============================================================================
--- head/sys/net/if_lagg.c	Thu May 25 23:14:51 2017	(r318906)
+++ head/sys/net/if_lagg.c	Thu May 25 23:19:09 2017	(r318907)
@@ -1773,7 +1773,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.
@@ -1800,22 +1799,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);
 }
 
@@ -1832,7 +1815,6 @@ lagg_enqueue(struct ifnet *ifp, struct 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;
 }
@@ -2001,9 +1983,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: head/sys/net/if_lagg.h
==============================================================================
--- head/sys/net/if_lagg.h	Thu May 25 23:14:51 2017	(r318906)
+++ head/sys/net/if_lagg.h	Thu May 25 23:19:09 2017	(r318907)
@@ -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 {

Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201705252319.v4PNJ9Ps076446>