5a5b838f57
- M_DONTWAIT -> M_NOWAIT - Don't rely on namespace pollution and #include <sys/mbuf.h> explicitly
49 lines
1.4 KiB
Text
49 lines
1.4 KiB
Text
--- 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));
|