diff options
| author | Max Khon <fjoe@FreeBSD.org> | 2014-02-09 05:53:16 +0000 |
|---|---|---|
| committer | Max Khon <fjoe@FreeBSD.org> | 2014-02-09 05:53:16 +0000 |
| commit | e8b880d3a232721fbd3d40ef3c7df5a696b89bea (patch) | |
| tree | 29bda5b6643bab4e98d29b146b68c9676dbe0a3d /net/aoe | |
| parent | c3490cdcc2a2027395f4dd005ed2924985a972b6 (diff) | |
| download | ports-e8b880d3a232721fbd3d40ef3c7df5a696b89bea.tar.gz ports-e8b880d3a232721fbd3d40ef3c7df5a696b89bea.zip | |
Unbreak on -CURRENT: M_DONTWAIT -> M_NOWAIT.
Notes
Notes:
svn path=/head/; revision=343431
Diffstat (limited to 'net/aoe')
| -rw-r--r-- | net/aoe/files/patch-aoenet.c | 31 |
1 files changed, 29 insertions, 2 deletions
diff --git a/net/aoe/files/patch-aoenet.c b/net/aoe/files/patch-aoenet.c index 42054d871913..97e933f4897c 100644 --- a/net/aoe/files/patch-aoenet.c +++ b/net/aoe/files/patch-aoenet.c @@ -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; |