From owner-svn-src-head@freebsd.org  Sat Mar 25 01:45:05 2017
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 684C0D1B418;
 Sat, 25 Mar 2017 01:45:05 +0000 (UTC) (envelope-from np@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 381882BB;
 Sat, 25 Mar 2017 01:45:05 +0000 (UTC) (envelope-from np@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v2P1j4aU013727;
 Sat, 25 Mar 2017 01:45:04 GMT (envelope-from np@FreeBSD.org)
Received: (from np@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v2P1j4Cj013726;
 Sat, 25 Mar 2017 01:45:04 GMT (envelope-from np@FreeBSD.org)
Message-Id: <201703250145.v2P1j4Cj013726@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: np set sender to np@FreeBSD.org
 using -f
From: Navdeep Parhar <np@FreeBSD.org>
Date: Sat, 25 Mar 2017 01:45:04 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r315921 - head/sys/dev/cxgbe/iw_cxgbe
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 25 Mar 2017 01:45:05 -0000

Author: np
Date: Sat Mar 25 01:45:04 2017
New Revision: 315921
URL: https://svnweb.freebsd.org/changeset/base/315921

Log:
  cxgbe/iw_cxgbe: alloc_ep expects a gfp_t, and it's always ok to sleep during
  alloc_ep.

Modified:
  head/sys/dev/cxgbe/iw_cxgbe/cm.c

Modified: head/sys/dev/cxgbe/iw_cxgbe/cm.c
==============================================================================
--- head/sys/dev/cxgbe/iw_cxgbe/cm.c	Sat Mar 25 01:38:17 2017	(r315920)
+++ head/sys/dev/cxgbe/iw_cxgbe/cm.c	Sat Mar 25 01:45:04 2017	(r315921)
@@ -695,7 +695,7 @@ process_newconn(struct iw_cm_id *parent_
 
 	MPASS(child_so != NULL);
 
-	child_ep = alloc_ep(sizeof(*child_ep), M_WAITOK);
+	child_ep = alloc_ep(sizeof(*child_ep), GFP_KERNEL);
 
 	CTR5(KTR_IW_CXGBE,
 	    "%s: parent so %p, parent ep %p, child so %p, child ep %p",
@@ -2134,7 +2134,7 @@ int c4iw_connect(struct iw_cm_id *cm_id,
 		err = -EINVAL;
 		goto out;
 	}
-	ep = alloc_ep(sizeof(*ep), M_NOWAIT);
+	ep = alloc_ep(sizeof(*ep), GFP_KERNEL);
 
 	if (!ep) {