From owner-svn-src-all@FreeBSD.ORG  Fri Oct 19 05:50:56 2012
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id A0F9F475;
 Fri, 19 Oct 2012 05:50:56 +0000 (UTC)
 (envelope-from kientzle@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
 by mx1.freebsd.org (Postfix) with ESMTP id 896308FC0A;
 Fri, 19 Oct 2012 05:50:56 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q9J5ouEG007630;
 Fri, 19 Oct 2012 05:50:56 GMT
 (envelope-from kientzle@svn.freebsd.org)
Received: (from kientzle@localhost)
 by svn.freebsd.org (8.14.4/8.14.4/Submit) id q9J5ouwI007628;
 Fri, 19 Oct 2012 05:50:56 GMT
 (envelope-from kientzle@svn.freebsd.org)
Message-Id: <201210190550.q9J5ouwI007628@svn.freebsd.org>
From: Tim Kientzle <kientzle@FreeBSD.org>
Date: Fri, 19 Oct 2012 05:50:56 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r241721 - head/sys/arm/ti/cpsw
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 19 Oct 2012 05:50:56 -0000

Author: kientzle
Date: Fri Oct 19 05:50:56 2012
New Revision: 241721
URL: http://svn.freebsd.org/changeset/base/241721

Log:
  Replace deprecated M_DONTWAIT with M_NOWAIT.

Modified:
  head/sys/arm/ti/cpsw/if_cpsw.c

Modified: head/sys/arm/ti/cpsw/if_cpsw.c
==============================================================================
--- head/sys/arm/ti/cpsw/if_cpsw.c	Fri Oct 19 05:43:38 2012	(r241720)
+++ head/sys/arm/ti/cpsw/if_cpsw.c	Fri Oct 19 05:50:56 2012	(r241721)
@@ -522,7 +522,7 @@ cpsw_new_rxbuf(struct cpsw_softc *sc, ui
 	int error;
 	int nsegs;
 
-	sc->rx_mbuf[i] = m_getcl(M_DONTWAIT, MT_DATA, M_PKTHDR);
+	sc->rx_mbuf[i] = m_getcl(M_NOWAIT, MT_DATA, M_PKTHDR);
 	if (sc->rx_mbuf[i] == NULL)
 		return (ENOBUFS);
 
@@ -628,7 +628,7 @@ cpsw_start_locked(struct ifnet *ifp)
 		if (m0 == NULL)
 			break;
 
-		mtmp = m_defrag(m0, M_DONTWAIT);
+		mtmp = m_defrag(m0, M_NOWAIT);
 		if (mtmp)
 			m0 = mtmp;