Date: Sun, 9 Feb 2014 06:05:30 +0000 (UTC) From: Max Khon <fjoe@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r343432 - head/misc/dahdi-kmod/files Message-ID: <201402090605.s1965Uea036700@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: fjoe Date: Sun Feb 9 06:05:30 2014 New Revision: 343432 URL: http://svnweb.freebsd.org/changeset/ports/343432 QAT: https://qat.redports.org/buildarchive/r343432/ Log: Unbreak on -CURRENT: - M_DONTWAIT -> M_NOWAIT - Don't rely on namespace pollution and #include <sys/mbuf.h> explicitly Added: head/misc/dahdi-kmod/files/patch-mbuf (contents, props changed) Added: head/misc/dahdi-kmod/files/patch-mbuf ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/misc/dahdi-kmod/files/patch-mbuf Sun Feb 9 06:05:30 2014 (r343432) @@ -0,0 +1,49 @@ +--- freebsd/drivers/dahdi/dahdi_dynamic_eth.c.orig 2014-02-09 12:58:15.000000000 +0700 ++++ freebsd/drivers/dahdi/dahdi_dynamic_eth.c 2014-02-09 12:58:57.000000000 +0700 +@@ -27,6 +27,7 @@ + #include <sys/param.h> + #include <sys/conf.h> + #include <sys/module.h> ++#include <sys/mbuf.h> + + #include "ng_dahdi_netdev.h" + #else /* !__FreeBSD__ */ +@@ -204,10 +205,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 */ +--- freebsd/drivers/dahdi/dahdi_dynamic_ethmf.c.orig 2014-02-09 12:59:17.000000000 +0700 ++++ freebsd/drivers/dahdi/dahdi_dynamic_ethmf.c 2014-02-09 12:59:47.000000000 +0700 +@@ -28,6 +28,7 @@ + #include <sys/param.h> + #include <sys/conf.h> + #include <sys/module.h> ++#include <sys/mbuf.h> + + #include "ng_dahdi_netdev.h" + #else /* !__FreeBSD__ */ +@@ -522,13 +523,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 0; + } +- 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));
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201402090605.s1965Uea036700>