From 8dea3e53a9c0795777401b723c9b5be1405d4c05 Mon Sep 17 00:00:00 2001
From: Augustin Cavalier <waddlesplash@gmail.com>
Date: Thu, 4 Oct 2018 20:06:15 -0400
Subject: [PATCH] freebsd11_network: Fixup last commit for C++ compatibility.

---
 .../compat/freebsd11_network/compat/net/if_var.h | 16 ++++++++--------
 .../freebsd11_network/compat/sys/buf_ring.h      |  4 ++--
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/libs/compat/freebsd11_network/compat/net/if_var.h b/src/libs/compat/freebsd11_network/compat/net/if_var.h
index e77ffdab2f..0142601aca 100644
--- a/src/libs/compat/freebsd11_network/compat/net/if_var.h
+++ b/src/libs/compat/freebsd11_network/compat/net/if_var.h
@@ -645,7 +645,7 @@ drbr_enqueue(struct ifnet *ifp, struct buf_ring *br, struct mbuf *m)
 }
 
 static __inline void
-drbr_putback(struct ifnet *ifp, struct buf_ring *br, struct mbuf *new)
+drbr_putback(struct ifnet *ifp, struct buf_ring *br, struct mbuf *_new)
 {
 	/*
 	 * The top of the list needs to be swapped
@@ -657,11 +657,11 @@ drbr_putback(struct ifnet *ifp, struct buf_ring *br, struct mbuf *new)
 		 * Peek in altq case dequeued it
 		 * so put it back.
 		 */
-		IFQ_DRV_PREPEND(&ifp->if_snd, new);
+		IFQ_DRV_PREPEND(&ifp->if_snd, _new);
 		return;
 	}
 #endif
-	buf_ring_putback_sc(br, new);
+	buf_ring_putback_sc(br, _new);
 }
 
 static __inline struct mbuf *
@@ -680,7 +680,7 @@ drbr_peek(struct ifnet *ifp, struct buf_ring *br)
 		return (m);
 	}
 #endif
-	return(buf_ring_peek_clear_sc(br));
+	return (struct mbuf*)buf_ring_peek_clear_sc(br);
 }
 
 static __inline void
@@ -692,7 +692,7 @@ drbr_flush(struct ifnet *ifp, struct buf_ring *br)
 	if (ifp != NULL && ALTQ_IS_ENABLED(&ifp->if_snd))
 		IFQ_PURGE(&ifp->if_snd);
 #endif
-	while ((m = buf_ring_dequeue_sc(br)) != NULL)
+	while ((m = (struct mbuf*)buf_ring_dequeue_sc(br)) != NULL)
 		m_freem(m);
 }
 
@@ -715,7 +715,7 @@ drbr_dequeue(struct ifnet *ifp, struct buf_ring *br)
 		return (m);
 	}
 #endif
-	return (buf_ring_dequeue_sc(br));
+	return (struct mbuf*)buf_ring_dequeue_sc(br);
 }
 
 static __inline void
@@ -748,11 +748,11 @@ drbr_dequeue_cond(struct ifnet *ifp, struct buf_ring *br,
 		return (m);
 	}
 #endif
-	m = buf_ring_peek(br);
+	m = (struct mbuf*)buf_ring_peek(br);
 	if (m == NULL || func(m, arg) == 0)
 		return (NULL);
 
-	return (buf_ring_dequeue_sc(br));
+	return (struct mbuf*)buf_ring_dequeue_sc(br);
 }
 
 static __inline int
diff --git a/src/libs/compat/freebsd11_network/compat/sys/buf_ring.h b/src/libs/compat/freebsd11_network/compat/sys/buf_ring.h
index fe307e7cef..9cecf41efc 100644
--- a/src/libs/compat/freebsd11_network/compat/sys/buf_ring.h
+++ b/src/libs/compat/freebsd11_network/compat/sys/buf_ring.h
@@ -267,11 +267,11 @@ buf_ring_advance_sc(struct buf_ring *br)
  * the compare and an atomic.
  */
 static __inline void
-buf_ring_putback_sc(struct buf_ring *br, void *new)
+buf_ring_putback_sc(struct buf_ring *br, void *_new)
 {
 	KASSERT(br->br_cons_head != br->br_prod_tail,
 		("Buf-Ring has none in putback")) ;
-	br->br_ring[br->br_cons_head] = new;
+	br->br_ring[br->br_cons_head] = _new;
 }
 
 /*