Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 17 Apr 2020 05:59:39 +0000 (UTC)
From:      Gleb Smirnoff <glebius@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r360034 - head/sys/netgraph
Message-ID:  <202004170559.03H5xdoq061078@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: glebius
Date: Fri Apr 17 05:59:38 2020
New Revision: 360034
URL: https://svnweb.freebsd.org/changeset/base/360034

Log:
  Don't initialize m->m_data to m->m_pktdat, this is already done by the
  mbuf allocator.  That was the last remnant of such code in the kernel.

Modified:
  head/sys/netgraph/ng_tty.c

Modified: head/sys/netgraph/ng_tty.c
==============================================================================
--- head/sys/netgraph/ng_tty.c	Fri Apr 17 02:22:15 2020	(r360033)
+++ head/sys/netgraph/ng_tty.c	Fri Apr 17 05:59:38 2020	(r360034)
@@ -439,7 +439,6 @@ ngt_rint_bypass(struct tty *tp, const void *buf, size_
 		 * Odd, we have changed from non-bypass to bypass. It is
 		 * unlikely but not impossible, flush the data first.
 		 */
-		sc->m->m_data = sc->m->m_pktdat;
 		NG_SEND_DATA_ONLY(error, sc->hook, sc->m);
 		sc->m = NULL;
 	}
@@ -495,7 +494,6 @@ ngt_rint(struct tty *tp, char c, int flags)
 
 	/* Ship off mbuf if it's time */
 	if (sc->hotchar == -1 || c == sc->hotchar || m->m_len >= MHLEN) {
-		m->m_data = m->m_pktdat;
 		sc->m = NULL;
 		NG_SEND_DATA_ONLY(error, sc->hook, m);	/* Will queue */
 	}



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