svn commit: r193411 - user/kmacy/releng_7_2_fcs/sys/dev/cxgb/sys

[Kip Macy]

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);
 }