svn commit: r229872 - stable/7/sys/dev/fxp

Pyun YongHyeon yongari at
Mon Jan 9 19:31:36 UTC 2012

Author: yongari
Date: Mon Jan  9 19:31:35 2012
New Revision: 229872

  MFC r228716:
    TCP header size is represented by number of 32bits words.
    Fix the TCP header size calculation such that makes TSO engine
    cache all header(ethernet/IP/TCP) bytes to its internal buffer.
    While here, remove extra pull up for TCP payload.  Unlike some
    em(4) controllers, fxp(4) does not require such work around for
    The two limitations are ethernet/IP/TCP header size should be less
    than or equal to the size of controller's internal buffer(80 bytes)
    and these header information should be found in the first fragment
    of a TSO frame.

Directory Properties:
  stable/7/sys/   (props changed)
  stable/7/sys/cddl/contrib/opensolaris/   (props changed)
  stable/7/sys/contrib/dev/acpica/   (props changed)
  stable/7/sys/contrib/pf/   (props changed)

Modified: stable/7/sys/dev/fxp/if_fxp.c
--- stable/7/sys/dev/fxp/if_fxp.c	Mon Jan  9 19:30:23 2012	(r229871)
+++ stable/7/sys/dev/fxp/if_fxp.c	Mon Jan  9 19:31:35 2012	(r229872)
@@ -1455,7 +1455,7 @@ fxp_encap(struct fxp_softc *sc, struct m
 			return (ENOBUFS);
 		tcp = (struct tcphdr *)(mtod(m, char *) + poff);
-		m = m_pullup(m, poff + sizeof(struct tcphdr) + tcp->th_off);
+		m = m_pullup(m, poff + (tcp->th_off << 2));
 		if (m == NULL) {
 			*m_head = NULL;
 			return (ENOBUFS);

More information about the svn-src-stable-7 mailing list