svn commit: r343431 - head/net/aoe/files

Max Khon fjoe at FreeBSD.org
Sun Feb 9 05:53:17 UTC 2014


Author: fjoe
Date: Sun Feb  9 05:53:16 2014
New Revision: 343431
URL: http://svnweb.freebsd.org/changeset/ports/343431
QAT: https://qat.redports.org/buildarchive/r343431/

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

Modified:
  head/net/aoe/files/patch-aoenet.c

Modified: head/net/aoe/files/patch-aoenet.c
==============================================================================
--- head/net/aoe/files/patch-aoenet.c	Sun Feb  9 04:03:55 2014	(r343430)
+++ head/net/aoe/files/patch-aoenet.c	Sun Feb  9 05:53:16 2014	(r343431)
@@ -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;


More information about the svn-ports-all mailing list