3 files changed, 6 insertions, 6 deletions

diff --git a/sys/dev/cxgb/cxgb_main.c b/sys/dev/cxgb/cxgb_main.c
index dff4591389ed..ee67e3be2a27 100644
--- a/sys/dev/cxgb/cxgb_main.c
+++ b/sys/dev/cxgb/cxgb_main.c
@@ -1868,10 +1868,10 @@ cxgb_start_tx(struct ifnet *ifp, uint32_t txmax)
 #ifdef notyet
 		m0 = m;
 		if (collapse_mbufs && m->m_pkthdr.len > MCLBYTES &&
-		    m_collapse(m, TX_MAX_SEGS, &m0) == EFBIG) {
+		    cxgb_m_collapse(m, TX_MAX_SEGS, &m0) == EFBIG) {
 			if ((m0 = m_defrag(m, M_NOWAIT)) != NULL) {
 				m = m0;
-				m_collapse(m, TX_MAX_SEGS, &m0);
+				cxgb_m_collapse(m, TX_MAX_SEGS, &m0);
 			} else
 				break;
 		}
diff --git a/sys/dev/cxgb/sys/mvec.h b/sys/dev/cxgb/sys/mvec.h
index 47520705f7a7..27620044c62b 100644
--- a/sys/dev/cxgb/sys/mvec.h
+++ b/sys/dev/cxgb/sys/mvec.h
@@ -64,7 +64,7 @@ struct mbuf_vec {
 };
 
 int _m_explode(struct mbuf *);
-int _m_collapse(struct mbuf *, int maxbufs, struct mbuf **);
+int _cxgb_m_collapse(struct mbuf *, int maxbufs, struct mbuf **);
 void mb_free_vec(struct mbuf *m);
 
 static __inline void 
@@ -111,7 +111,7 @@ m_explode(struct mbuf *m)
 } 
  
 static __inline int
-m_collapse(struct mbuf *m, int maxbufs, struct mbuf **mnew) 
+cxgb_m_collapse(struct mbuf *m, int maxbufs, struct mbuf **mnew) 
 {
 #if (!defined(__sparc64__) && !defined(__sun4v__)) 	
 	if (m->m_next == NULL)
@@ -120,7 +120,7 @@ m_collapse(struct mbuf *m, int maxbufs, struct mbuf **mnew)
 		*mnew = m;
 		return (0);
 	}
-	return _m_collapse(m, maxbufs, mnew);
+	return _cxgb_m_collapse(m, maxbufs, mnew);
 } 
 
 static __inline struct mbuf *
diff --git a/sys/dev/cxgb/sys/uipc_mvec.c b/sys/dev/cxgb/sys/uipc_mvec.c
index 04082727eb7c..02fe4598a6dc 100644
--- a/sys/dev/cxgb/sys/uipc_mvec.c
+++ b/sys/dev/cxgb/sys/uipc_mvec.c
@@ -254,7 +254,7 @@ m_setiovec(struct mbuf_iovec *mi, struct mbuf *m, struct mbuf_ext *extvec, int *
 }
 
 int
-_m_collapse(struct mbuf *m, int maxbufs, struct mbuf **mnew)
+_cxgb_m_collapse(struct mbuf *m, int maxbufs, struct mbuf **mnew)
 {
 	struct mbuf *m0, *lmvec[MAX_BUFS];
 	struct mbuf **mnext;