mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-12-23 04:23:08 +00:00
Code Issues Releases Activity

Unbreak on -CURRENT: M_DONTWAIT -> M_NOWAIT.

Browse Source
This commit is contained in:
Max Khon 2014-02-09 05:53:16 +00:00
parent c3490cdcc2
commit e8b880d3a2
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=343431
1 changed files with 29 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
net/aoe/files/patch-aoenet.c
View File

@ -1,5 +1,5 @@
--- aoenet.c.orig 2013-11-18 21:43:13.000000000 +0700
+++ aoenet.c 2013-11-18 21:43:21.000000000 +0700
--- aoenet.c.orig 2006-05-25 23:10:11.000000000 +0700
+++ aoenet.c 2014-02-09 12:48:36.000000000 +0700
@@ -77,8 +77,11 @@
#define NECODES (sizeof(aoe_errlist) / sizeof(char *) - 1)
#if (__FreeBSD_version < 600000)
@ -32,6 +32,24 @@
/* Create a mbuf chain and point to our data section(s). */
static struct mbuf *
@@ -201,7 +212,7 @@
{
struct mbuf *m;
- if ((m = m_gethdr(M_DONTWAIT, MT_DATA)) == NULL)
+ if ((m = m_gethdr(M_NOWAIT, MT_DATA)) == NULL)
return (NULL);
m->m_len = AOEHDRSZ;
m->m_pkthdr.len = f->f_mlen;
@@ -215,7 +226,7 @@
u_int len;
len = f->f_mlen - AOEHDRSZ;
- if ((m1 = m_get(M_DONTWAIT, MT_DATA)) == NULL) {
+ if ((m1 = m_get(M_NOWAIT, MT_DATA)) == NULL) {
m_freem(m);
return (NULL);
}
@@ -223,6 +234,9 @@
m1->m_ext.ref_cnt = NULL;
@ -42,3 +60,12 @@
NULL, 0, EXT_NET_DRV);
m1->m_len = len;
m1->m_next = NULL;
@@ -276,7 +290,7 @@
if (!is_aoe_netif(ifp))
continue;
memcpy(h->ah_src, IFPADDR(ifp), sizeof(h->ah_src));
- m = m_copypacket(m0, M_DONTWAIT);
+ m = m_copypacket(m0, M_NOWAIT);
if (m == NULL) {
IPRINTK("m_copypacket failure\n");
continue;