From owner-svn-src-head@freebsd.org  Wed May 11 17:17:49 2016
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 CC493B377FE;
 Wed, 11 May 2016 17:17:49 +0000 (UTC)
 (envelope-from hselasky@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 9E66918E3;
 Wed, 11 May 2016 17:17:49 +0000 (UTC)
 (envelope-from hselasky@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u4BHHmEw043015;
 Wed, 11 May 2016 17:17:48 GMT (envelope-from hselasky@FreeBSD.org)
Received: (from hselasky@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u4BHHmQU043014;
 Wed, 11 May 2016 17:17:48 GMT (envelope-from hselasky@FreeBSD.org)
Message-Id: <201605111717.u4BHHmQU043014@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: hselasky set sender to
 hselasky@FreeBSD.org using -f
From: Hans Petter Selasky <hselasky@FreeBSD.org>
Date: Wed, 11 May 2016 17:17:48 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r299468 - 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.22
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: Wed, 11 May 2016 17:17:49 -0000

Author: hselasky
Date: Wed May 11 17:17:48 2016
New Revision: 299468
URL: https://svnweb.freebsd.org/changeset/base/299468

Log:
  The idr_for_each() function is now part of the LinuxKPI. Use the
  LinuxKPI's idr_for_each() function instead of the local one to avoid
  compilation issues.
  
  Discussed with:	np @
  MFC after:	1 week

Modified:
  head/sys/dev/cxgbe/iw_cxgbe/iw_cxgbe.h

Modified: head/sys/dev/cxgbe/iw_cxgbe/iw_cxgbe.h
==============================================================================
--- head/sys/dev/cxgbe/iw_cxgbe/iw_cxgbe.h	Wed May 11 17:07:29 2016	(r299467)
+++ head/sys/dev/cxgbe/iw_cxgbe/iw_cxgbe.h	Wed May 11 17:17:48 2016	(r299468)
@@ -1004,43 +1004,6 @@ gen_pool_destroy(struct gen_pool *gp)
 #define L1_CACHE_BYTES 32
 #endif
 
-static inline
-int idr_for_each(struct idr *idp,
-                 int (*fn)(int id, void *p, void *data), void *data)
-{
-        int n, id, max, error = 0;
-        struct idr_layer *p;
-        struct idr_layer *pa[MAX_LEVEL];
-        struct idr_layer **paa = &pa[0];
-
-        n = idp->layers * IDR_BITS;
-        p = idp->top;
-        max = 1 << n;
-
-        id = 0;
-        while (id < max) {
-                while (n > 0 && p) {
-                        n -= IDR_BITS;
-                        *paa++ = p;
-                        p = p->ary[(id >> n) & IDR_MASK];
-                }
-
-                if (p) {
-                        error = fn(id, (void *)p, data);
-                        if (error)
-                                break;
-                }
-
-                id += 1 << n;
-                while (n < fls(id)) {
-                        n += IDR_BITS;
-                        p = *--paa;
-                }
-        }
-
-        return error;
-}
-
 void c4iw_cm_init_cpl(struct adapter *);
 void c4iw_cm_term_cpl(struct adapter *);