From owner-svn-src-user@freebsd.org Wed Apr 11 20:02:25 2018 Return-Path: Delivered-To: svn-src-user@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 353ABF8D3D4 for ; Wed, 11 Apr 2018 20:02:25 +0000 (UTC) (envelope-from markj@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id D54EA726AD; Wed, 11 Apr 2018 20:02:24 +0000 (UTC) (envelope-from markj@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 D03E120CFC; Wed, 11 Apr 2018 20:02:24 +0000 (UTC) (envelope-from markj@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w3BK2OXK098902; Wed, 11 Apr 2018 20:02:24 GMT (envelope-from markj@FreeBSD.org) Received: (from markj@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w3BK2ObC098899; Wed, 11 Apr 2018 20:02:24 GMT (envelope-from markj@FreeBSD.org) Message-Id: <201804112002.w3BK2ObC098899@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: markj set sender to markj@FreeBSD.org using -f From: Mark Johnston Date: Wed, 11 Apr 2018 20:02:24 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r332417 - in user/markj/netdump/sys: kern netinet/netdump sys X-SVN-Group: user X-SVN-Commit-Author: markj X-SVN-Commit-Paths: in user/markj/netdump/sys: kern netinet/netdump sys X-SVN-Commit-Revision: 332417 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 11 Apr 2018 20:02:25 -0000 Author: markj Date: Wed Apr 11 20:02:24 2018 New Revision: 332417 URL: https://svnweb.freebsd.org/changeset/base/332417 Log: Remove the unneeded EXT_NETDUMP. Modified: user/markj/netdump/sys/kern/kern_mbuf.c user/markj/netdump/sys/netinet/netdump/netdump_client.c user/markj/netdump/sys/sys/mbuf.h Modified: user/markj/netdump/sys/kern/kern_mbuf.c ============================================================================== --- user/markj/netdump/sys/kern/kern_mbuf.c Wed Apr 11 19:46:24 2018 (r332416) +++ user/markj/netdump/sys/kern/kern_mbuf.c Wed Apr 11 20:02:24 2018 (r332417) @@ -867,7 +867,6 @@ mb_free_ext(struct mbuf *m) case EXT_NET_DRV: case EXT_MOD_TYPE: case EXT_DISPOSABLE: - case EXT_NETDUMP: KASSERT(mref->m_ext.ext_free != NULL, ("%s: ext_free not set", __func__)); mref->m_ext.ext_free(mref); Modified: user/markj/netdump/sys/netinet/netdump/netdump_client.c ============================================================================== --- user/markj/netdump/sys/netinet/netdump/netdump_client.c Wed Apr 11 19:46:24 2018 (r332416) +++ user/markj/netdump/sys/netinet/netdump/netdump_client.c Wed Apr 11 20:02:24 2018 (r332417) @@ -368,7 +368,7 @@ restart: } /* - * Dummy free function for EXT_NETDUMP clusters. + * Dummy free function for netdump clusters. */ static void netdump_mbuf_free(struct mbuf *m __unused) @@ -454,7 +454,7 @@ retransmit: return (ENOBUFS); } MEXTADD(m2, data + sent_so_far, pktlen, - netdump_mbuf_free, NULL, NULL, 0, EXT_NETDUMP); + netdump_mbuf_free, NULL, NULL, 0, EXT_DISPOSABLE); m2->m_len = pktlen; m_cat(m, m2); Modified: user/markj/netdump/sys/sys/mbuf.h ============================================================================== --- user/markj/netdump/sys/sys/mbuf.h Wed Apr 11 19:46:24 2018 (r332416) +++ user/markj/netdump/sys/sys/mbuf.h Wed Apr 11 20:02:24 2018 (r332417) @@ -438,7 +438,6 @@ struct mbuf { #define EXT_JUMBO16 5 /* jumbo cluster 16184 bytes */ #define EXT_PACKET 6 /* mbuf+cluster from packet zone */ #define EXT_MBUF 7 /* external mbuf reference */ -#define EXT_NETDUMP 8 /* network kernel dump */ #define EXT_VENDOR1 224 /* for vendor-internal use */ #define EXT_VENDOR2 225 /* for vendor-internal use */