From owner-svn-src-user@FreeBSD.ORG Sun Oct 20 18:13:06 2013 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id CA07DC5A; Sun, 20 Oct 2013 18:13:06 +0000 (UTC) (envelope-from andre@FreeBSD.org) 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)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id B834B2787; Sun, 20 Oct 2013 18:13:06 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9KID6XU080190; Sun, 20 Oct 2013 18:13:06 GMT (envelope-from andre@svn.freebsd.org) Received: (from andre@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9KID6r8080189; Sun, 20 Oct 2013 18:13:06 GMT (envelope-from andre@svn.freebsd.org) Message-Id: <201310201813.r9KID6r8080189@svn.freebsd.org> From: Andre Oppermann Date: Sun, 20 Oct 2013 18:13:06 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r256797 - user/andre/mbuf_staging/dev/wb X-SVN-Group: user 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.14 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: Sun, 20 Oct 2013 18:13:06 -0000 Author: andre Date: Sun Oct 20 18:13:06 2013 New Revision: 256797 URL: http://svnweb.freebsd.org/changeset/base/256797 Log: Sorta fix the wb(4) driver to allocate complete mbuf+cluster packets and remove the need for MEXTADD. I don't believe the driver was in working condition before. Untested due to lack of hardware. Modified: user/andre/mbuf_staging/dev/wb/if_wb.c Modified: user/andre/mbuf_staging/dev/wb/if_wb.c ============================================================================== --- user/andre/mbuf_staging/dev/wb/if_wb.c Sun Oct 20 17:47:40 2013 (r256796) +++ user/andre/mbuf_staging/dev/wb/if_wb.c Sun Oct 20 18:13:06 2013 (r256797) @@ -142,7 +142,6 @@ static int wb_probe(device_t); static int wb_attach(device_t); static int wb_detach(device_t); -static int wb_bfree(struct mbuf *, void *addr, void *args, int action); static int wb_newbuf(struct wb_softc *, struct wb_chain_onefrag *, struct mbuf *); static int wb_encap(struct wb_softc *, struct wb_chain *, struct mbuf *); @@ -822,13 +821,6 @@ wb_list_rx_init(sc) return(0); } -static int -wb_bfree(struct mbuf *m, void *buf, void *args, int action) -{ - - return (EXT_FREE_OK); -} - /* * Initialize an RX descriptor and attach an MBUF cluster. */ @@ -841,13 +833,10 @@ wb_newbuf(sc, c, m) struct mbuf *m_new = NULL; if (m == NULL) { - MGETHDR(m_new, M_NOWAIT, MT_DATA); + m_new = m_getcl(M_NOWAIT, MT_DATA, 0); if (m_new == NULL) return(ENOBUFS); - m_new->m_data = c->wb_buf; m_new->m_pkthdr.len = m_new->m_len = WB_BUFBYTES; - MEXTADD(m_new, c->wb_buf, WB_BUFBYTES, wb_bfree, c->wb_buf, - NULL, 0, EXT_NET_DRV); } else { m_new = m; m_new->m_len = m_new->m_pkthdr.len = WB_BUFBYTES;