svn commit: r265290 - stable/9/sys/net

[Rick Macklem]

Author: rmacklem
Date: Sat May  3 22:27:24 2014
New Revision: 265290
URL: http://svnweb.freebsd.org/changeset/base/265290

Log:
  MFC: r264469, r264498
  Lagg did not set the value of if_hw_tsomax, so when lagg
  was stacked on top of network interfaces that set if_hw_tsomax,
  tcp_output() would see the default value instead of the value
  set by the network interface(s). This patch modifies lagg so that
  it sets if_hw_tsomax to the minimum of the value(s) for the
  underlying network interfaces.

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

Modified: stable/9/sys/net/if_lagg.c
==============================================================================
--- stable/9/sys/net/if_lagg.c  Sat May  3 20:33:00 2014        (r265289)
+++ stable/9/sys/net/if_lagg.c  Sat May  3 22:27:24 2014        (r265290)
@@ -54,11 +54,11 @@ __FBSDID("$FreeBSD$");
 
 #if defined(INET) || defined(INET6)
 #include <netinet/in.h>
+#include <netinet/ip.h>
 #endif
 #ifdef INET
 #include <netinet/in_systm.h>
 #include <netinet/if_ether.h>
-#include <netinet/ip.h>
 #endif
 
 #ifdef INET6
@@ -406,6 +406,11 @@ lagg_capabilities(struct lagg_softc *sc)
        struct lagg_port *lp;
        int cap = ~0, ena = ~0;
        u_long hwa = ~0UL;
+#if defined(INET) || defined(INET6)
+       u_int hw_tsomax = IP_MAXPACKET; /* Initialize to the maximum value. */
+#else
+       u_int hw_tsomax = ~0;   /* if_hw_tsomax is only for INET/INET6, but.. */
+#endif
 
        LAGG_WLOCK_ASSERT(sc);
 
@@ -414,6 +419,10 @@ lagg_capabilities(struct lagg_softc *sc)
                cap &= lp->lp_ifp->if_capabilities;
                ena &= lp->lp_ifp->if_capenable;
                hwa &= lp->lp_ifp->if_hwassist;
+               /* Set to the minimum value of the lagg ports. */
+               if (lp->lp_ifp->if_hw_tsomax < hw_tsomax &&
+                   lp->lp_ifp->if_hw_tsomax > 0)
+                       hw_tsomax = lp->lp_ifp->if_hw_tsomax;
        }
        cap = (cap == ~0 ? 0 : cap);
        ena = (ena == ~0 ? 0 : ena);
@@ -421,10 +430,12 @@ lagg_capabilities(struct lagg_softc *sc)
 
        if (sc->sc_ifp->if_capabilities != cap ||
            sc->sc_ifp->if_capenable != ena ||
-           sc->sc_ifp->if_hwassist != hwa) {
+           sc->sc_ifp->if_hwassist != hwa ||
+           sc->sc_ifp->if_hw_tsomax != hw_tsomax) {
                sc->sc_ifp->if_capabilities = cap;
                sc->sc_ifp->if_capenable = ena;
                sc->sc_ifp->if_hwassist = hwa;
+               sc->sc_ifp->if_hw_tsomax = hw_tsomax;
                getmicrotime(&sc->sc_ifp->if_lastchange);
 
                if (sc->sc_ifflags & IFF_DEBUG)
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"