Skip site navigation (1)Skip section navigation (2) 
Date:      Fri, 20 Nov 2020 14:46:12 +0000
From:      "mhorne (Mitchell Horne)" <phabric-noreply@FreeBSD.org>
To:        Phabricator <phabric-noreply@FreeBSD.org>
Cc:        dev-reviews@freebsd.org
Subject:   [Differential] D27286: net/ifq.h: make header C++ friendly
Message-ID:  <5b6c43fd328fae8d40ad1bfbf105e2ae@localhost.localdomain>
In-Reply-To: <differential-rev-PHID-DREV-td2nhty4ivv4a2dl4vod-req@reviews.freebsd.org>
References:  <differential-rev-PHID-DREV-td2nhty4ivv4a2dl4vod-req@reviews.freebsd.org>
index | next in thread | previous in thread | raw e-mail 

[-- Attachment #1 --]
This revision was automatically updated to reflect the committed changes.
Closed by commit rS367894: Make net/ifq.h C++ friendly (authored by mhorne).
Herald added a subscriber: imp.

CHANGED PRIOR TO COMMIT
  https://reviews.freebsd.org/D27286?vs=79769&id=79800#toc

REPOSITORY
  rS FreeBSD src repository

CHANGES SINCE LAST UPDATE
  https://reviews.freebsd.org/D27286?vs=79769&id=79800

CHANGES SINCE LAST ACTION
  https://reviews.freebsd.org/D27286/new/

REVISION DETAIL
  https://reviews.freebsd.org/D27286

AFFECTED FILES
  head/sys/net/ifq.h

EMAIL PREFERENCES
  https://reviews.freebsd.org/settings/panel/emailpreferences/

To: mhorne, glebius, rscheff
Cc: imp, rscheff, ae, melifaro, #netapp, krzysztof.galazka_intel.com, dev-reviews

[-- Attachment #2 --]
diff --git a/head/sys/net/ifq.h b/head/sys/net/ifq.h
--- a/head/sys/net/ifq.h
+++ b/head/sys/net/ifq.h
@@ -336,7 +336,7 @@
 }
 
 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 *m_new)
 {
 	/*
 	 * The top of the list needs to be swapped 
@@ -348,11 +348,11 @@
 		 * Peek in altq case dequeued it
 		 * so put it back.
 		 */
-		IFQ_DRV_PREPEND(&ifp->if_snd, new);
+		IFQ_DRV_PREPEND(&ifp->if_snd, m_new);
 		return;
 	}
 #endif
-	buf_ring_putback_sc(br, new);
+	buf_ring_putback_sc(br, m_new);
 }
 
 static __inline struct mbuf *
@@ -371,7 +371,7 @@
 		return (m);
 	}
 #endif
-	return(buf_ring_peek_clear_sc(br));
+	return ((struct mbuf *)buf_ring_peek_clear_sc(br));
 }
 
 static __inline void
@@ -383,7 +383,7 @@
 	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);
 }
 
@@ -406,7 +406,7 @@
 		return (m);
 	}
 #endif
-	return (buf_ring_dequeue_sc(br));
+	return ((struct mbuf *)buf_ring_dequeue_sc(br));
 }
 
 static __inline void
@@ -438,11 +438,11 @@
 		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
help

Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?5b6c43fd328fae8d40ad1bfbf105e2ae>