From owner-svn-src-all@FreeBSD.ORG Tue Dec 16 11:52:17 2014 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 82FDD5A4; Tue, 16 Dec 2014 11:52:17 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 6EFCF169C; Tue, 16 Dec 2014 11:52:17 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sBGBqHSr040034; Tue, 16 Dec 2014 11:52:17 GMT (envelope-from ae@FreeBSD.org) Received: (from ae@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sBGBqH6O040031; Tue, 16 Dec 2014 11:52:17 GMT (envelope-from ae@FreeBSD.org) Message-Id: <201412161152.sBGBqH6O040031@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: ae set sender to ae@FreeBSD.org using -f From: "Andrey V. Elsukov" Date: Tue, 16 Dec 2014 11:52:17 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r275827 - in stable/9/sys: net netinet6 X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 16 Dec 2014 11:52:17 -0000 Author: ae Date: Tue Dec 16 11:52:15 2014 New Revision: 275827 URL: https://svnweb.freebsd.org/changeset/base/275827 Log: MFC r275394: Remove unneded check. No need to do m_pullup to the size that we prepended. Sponsored by: Yandex LLC Modified: stable/9/sys/net/if_stf.c stable/9/sys/netinet6/icmp6.c Directory Properties: stable/9/sys/ (props changed) stable/9/sys/net/ (props changed) Modified: stable/9/sys/net/if_stf.c ============================================================================== --- stable/9/sys/net/if_stf.c Tue Dec 16 11:49:35 2014 (r275826) +++ stable/9/sys/net/if_stf.c Tue Dec 16 11:52:15 2014 (r275827) @@ -511,8 +511,6 @@ stf_output(ifp, m, dst, ro) } M_PREPEND(m, sizeof(struct ip), M_DONTWAIT); - if (m && m->m_len < sizeof(struct ip)) - m = m_pullup(m, sizeof(struct ip)); if (m == NULL) { ifa_free(&ia6->ia_ifa); ifp->if_oerrors++; Modified: stable/9/sys/netinet6/icmp6.c ============================================================================== --- stable/9/sys/netinet6/icmp6.c Tue Dec 16 11:49:35 2014 (r275826) +++ stable/9/sys/netinet6/icmp6.c Tue Dec 16 11:52:15 2014 (r275827) @@ -361,8 +361,6 @@ icmp6_error(struct mbuf *m, int type, in preplen = sizeof(struct ip6_hdr) + sizeof(struct icmp6_hdr); M_PREPEND(m, preplen, M_DONTWAIT); /* FIB is also copied over. */ - if (m && m->m_len < preplen) - m = m_pullup(m, preplen); if (m == NULL) { nd6log((LOG_DEBUG, "ENOBUFS in icmp6_error %d\n", __LINE__)); return;