svn commit: r343454 - head/misc/dahdi-kmod26/files

Max Khon fjoe at FreeBSD.org
Sun Feb 9 10:48:31 UTC 2014


Author: fjoe
Date: Sun Feb  9 10:48:30 2014
New Revision: 343454
URL: http://svnweb.freebsd.org/changeset/ports/343454
QAT: https://qat.redports.org/buildarchive/r343454/

Log:
  Unbreak on -CURRENT: M_DONTWAIT -> M_NOWAIT.

Added:
  head/misc/dahdi-kmod26/files/patch-mbuf   (contents, props changed)

Added: head/misc/dahdi-kmod26/files/patch-mbuf
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/misc/dahdi-kmod26/files/patch-mbuf	Sun Feb  9 10:48:30 2014	(r343454)
@@ -0,0 +1,33 @@
+--- drivers/dahdi/dahdi_dynamic_eth.c.orig	2014-02-09 13:10:00.000000000 +0700
++++ drivers/dahdi/dahdi_dynamic_eth.c	2014-02-09 13:10:34.000000000 +0700
+@@ -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 */
+--- drivers/dahdi/dahdi_dynamic_ethmf.c.orig	2014-02-09 13:10:51.000000000 +0700
++++ drivers/dahdi/dahdi_dynamic_ethmf.c	2014-02-09 13:11:10.000000000 +0700
+@@ -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));


More information about the svn-ports-all mailing list