[svn-commits] fjoe: freebsd/trunk r10745 - /freebsd/trunk/drivers/dahdi/

[SVN commits to the Digium repositories]

Author: fjoe
Date: Sat May 10 02:59:53 2014
New Revision: 10745

URL: http://svnview.digium.com/svn/dahdi?view=rev&rev=10745
Log:
Unbreak on FreeBSD 10: M_DONTWAIT -> M_NOWAIT

Modified:
    freebsd/trunk/drivers/dahdi/dahdi_dynamic_eth.c
    freebsd/trunk/drivers/dahdi/dahdi_dynamic_ethmf.c

Modified: freebsd/trunk/drivers/dahdi/dahdi_dynamic_eth.c
URL: http://svnview.digium.com/svn/dahdi/freebsd/trunk/drivers/dahdi/dahdi_dynamic_eth.c?view=diff&rev=10745&r1=10744&r2=10745
==============================================================================
--- freebsd/trunk/drivers/dahdi/dahdi_dynamic_eth.c (original)
+++ freebsd/trunk/drivers/dahdi/dahdi_dynamic_eth.c Sat May 10 02:59:53 2014
@@ -191,10 +191,10 @@
 		dev = z->dev;
 		spin_unlock_irqrestore(&zlock, flags);
 #if defined(__FreeBSD__)
-		MGETHDR(m, M_DONTWAIT, MT_DATA);
+		MGETHDR(m, M_NOWAIT, MT_DATA);
 		if (m != NULL) {
 			if (sizeof(eh) + sizeof(zh) + msglen >= MINCLSIZE) {
-				MCLGET(m, M_DONTWAIT);
+				MCLGET(m, M_NOWAIT);
 			}
 
 			/* copy ethernet header */

Modified: freebsd/trunk/drivers/dahdi/dahdi_dynamic_ethmf.c
URL: http://svnview.digium.com/svn/dahdi/freebsd/trunk/drivers/dahdi/dahdi_dynamic_ethmf.c?view=diff&rev=10745&r1=10744&r2=10745
==============================================================================
--- freebsd/trunk/drivers/dahdi/dahdi_dynamic_ethmf.c (original)
+++ freebsd/trunk/drivers/dahdi/dahdi_dynamic_ethmf.c Sat May 10 02:59:53 2014
@@ -494,13 +494,13 @@
 		}
 
 #if defined(__FreeBSD__)
-		MGETHDR(m, M_DONTWAIT, MT_DATA);
+		MGETHDR(m, M_NOWAIT, MT_DATA);
 		if (m == NULL) {
 			rcu_read_unlock();
 			ethmf_errors_inc();
 			return;
 		}
-		MCLGET(m, M_DONTWAIT);
+		MCLGET(m, M_NOWAIT);
 
 		/* copy ethernet header and reserve space for ztdeth header */
 		bcopy(dev->dev_addr, &eh.ether_shost, sizeof(eh.ether_shost));