From owner-svn-ports-all@FreeBSD.ORG  Sun Feb  9 05:53:17 2014
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id F2FEC7FA;
 Sun,  9 Feb 2014 05:53:16 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id A16E116FE;
 Sun,  9 Feb 2014 05:53:16 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s195rGQw031422;
 Sun, 9 Feb 2014 05:53:16 GMT (envelope-from fjoe@svn.freebsd.org)
Received: (from fjoe@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s195rGEA031421;
 Sun, 9 Feb 2014 05:53:16 GMT (envelope-from fjoe@svn.freebsd.org)
Message-Id: <201402090553.s195rGEA031421@svn.freebsd.org>
From: Max Khon <fjoe@FreeBSD.org>
Date: Sun, 9 Feb 2014 05:53:16 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r343431 - head/net/aoe/files
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.17
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 09 Feb 2014 05:53:17 -0000

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;