From owner-svn-src-user@FreeBSD.ORG  Wed Jun  3 23:27:34 2009
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 6109F106564A;
	Wed,  3 Jun 2009 23:27:34 +0000 (UTC)
	(envelope-from kmacy@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 4FB388FC0A;
	Wed,  3 Jun 2009 23:27:34 +0000 (UTC)
	(envelope-from kmacy@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n53NRY8w070283;
	Wed, 3 Jun 2009 23:27:34 GMT (envelope-from kmacy@svn.freebsd.org)
Received: (from kmacy@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n53NRY5t070281;
	Wed, 3 Jun 2009 23:27:34 GMT (envelope-from kmacy@svn.freebsd.org)
Message-Id: <200906032327.n53NRY5t070281@svn.freebsd.org>
From: Kip Macy <kmacy@FreeBSD.org>
Date: Wed, 3 Jun 2009 23:27:34 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r193411 - user/kmacy/releng_7_2_fcs/sys/dev/cxgb/sys
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
	src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 03 Jun 2009 23:27:34 -0000

Author: kmacy
Date: Wed Jun  3 23:27:34 2009
New Revision: 193411
URL: http://svn.freebsd.org/changeset/base/193411

Log:
  busdmap_map_sg_vec can't fail - change to void

Modified:
  user/kmacy/releng_7_2_fcs/sys/dev/cxgb/sys/mvec.h
  user/kmacy/releng_7_2_fcs/sys/dev/cxgb/sys/uipc_mvec.c

Modified: user/kmacy/releng_7_2_fcs/sys/dev/cxgb/sys/mvec.h
==============================================================================
--- user/kmacy/releng_7_2_fcs/sys/dev/cxgb/sys/mvec.h	Wed Jun  3 23:01:13 2009	(r193410)
+++ user/kmacy/releng_7_2_fcs/sys/dev/cxgb/sys/mvec.h	Wed Jun  3 23:27:34 2009	(r193411)
@@ -50,7 +50,7 @@ busdma_map_mbuf_fast(struct mbuf *m, bus
 }
 
 int busdma_map_sg_collapse(struct mbuf **m, bus_dma_segment_t *segs, int *nsegs);
-int busdma_map_sg_vec(struct mbuf **m, bus_dma_segment_t *segs, int count);
+void busdma_map_sg_vec(struct mbuf **m, bus_dma_segment_t *segs, int count);
 static __inline int
 busdma_map_sgl(bus_dma_segment_t *vsegs, bus_dma_segment_t *segs, int count) 
 {

Modified: user/kmacy/releng_7_2_fcs/sys/dev/cxgb/sys/uipc_mvec.c
==============================================================================
--- user/kmacy/releng_7_2_fcs/sys/dev/cxgb/sys/uipc_mvec.c	Wed Jun  3 23:01:13 2009	(r193410)
+++ user/kmacy/releng_7_2_fcs/sys/dev/cxgb/sys/uipc_mvec.c	Wed Jun  3 23:27:34 2009	(r193411)
@@ -63,7 +63,6 @@ int
 busdma_map_sg_collapse(struct mbuf **m, bus_dma_segment_t *segs, int *nsegs)
 {
 	struct mbuf *n = *m;
-	struct mbuf *marray[TX_MAX_SEGS];
 	int seg_count, defragged = 0, err = 0;
 	bus_dma_segment_t *psegs;
 	
@@ -117,7 +116,7 @@ err_out:	
 	return (err);
 }
 
-int 
+void
 busdma_map_sg_vec(struct mbuf **m, bus_dma_segment_t *segs, int pkt_count)
 {
 	struct mbuf *m0;
@@ -126,6 +125,5 @@ busdma_map_sg_vec(struct mbuf **m, bus_d
 	for (m0 = *m, i = 0; i < pkt_count; segs++, i++, m0 = m0->m_nextpkt)
 		busdma_map_mbuf_fast(m0, segs);
 
-	return (0);
 }