From owner-svn-ports-head@FreeBSD.ORG  Sun Feb  9 06:05:31 2014
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@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 1DCE8936;
 Sun,  9 Feb 2014 06:05:31 +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 E25CE179A;
 Sun,  9 Feb 2014 06:05:30 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s1965UkR036701;
 Sun, 9 Feb 2014 06:05:30 GMT (envelope-from fjoe@svn.freebsd.org)
Received: (from fjoe@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s1965Uea036700;
 Sun, 9 Feb 2014 06:05:30 GMT (envelope-from fjoe@svn.freebsd.org)
Message-Id: <201402090605.s1965Uea036700@svn.freebsd.org>
From: Max Khon <fjoe@FreeBSD.org>
Date: Sun, 9 Feb 2014 06:05:30 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r343432 - head/misc/dahdi-kmod/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-head@freebsd.org
X-Mailman-Version: 2.1.17
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 09 Feb 2014 06:05:31 -0000

Author: fjoe
Date: Sun Feb  9 06:05:30 2014
New Revision: 343432
URL: http://svnweb.freebsd.org/changeset/ports/343432
QAT: https://qat.redports.org/buildarchive/r343432/

Log:
  Unbreak on -CURRENT:
  - M_DONTWAIT -> M_NOWAIT
  - Don't rely on namespace pollution and #include <sys/mbuf.h> explicitly

Added:
  head/misc/dahdi-kmod/files/patch-mbuf   (contents, props changed)

Added: head/misc/dahdi-kmod/files/patch-mbuf
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/misc/dahdi-kmod/files/patch-mbuf	Sun Feb  9 06:05:30 2014	(r343432)
@@ -0,0 +1,49 @@
+--- 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));