From owner-svn-src-head@freebsd.org Fri Apr 17 05:59:39 2020 Return-Path: Delivered-To: svn-src-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 5F7812AB121; Fri, 17 Apr 2020 05:59:39 +0000 (UTC) (envelope-from glebius@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 493QQz1rfkz4bsT; Fri, 17 Apr 2020 05:59:39 +0000 (UTC) (envelope-from glebius@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 3AC571DA43; Fri, 17 Apr 2020 05:59:39 +0000 (UTC) (envelope-from glebius@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 03H5xdJA061079; Fri, 17 Apr 2020 05:59:39 GMT (envelope-from glebius@FreeBSD.org) Received: (from glebius@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 03H5xdoq061078; Fri, 17 Apr 2020 05:59:39 GMT (envelope-from glebius@FreeBSD.org) Message-Id: <202004170559.03H5xdoq061078@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: glebius set sender to glebius@FreeBSD.org using -f From: Gleb Smirnoff Date: Fri, 17 Apr 2020 05:59:39 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r360034 - head/sys/netgraph X-SVN-Group: head X-SVN-Commit-Author: glebius X-SVN-Commit-Paths: head/sys/netgraph X-SVN-Commit-Revision: 360034 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 17 Apr 2020 05:59:39 -0000 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 */ }