From patchwork Tue Jan 24 15:28:39 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Schultz X-Patchwork-Id: 719221 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3v7BvM1nfJz9sxS for ; Wed, 25 Jan 2017 02:30:07 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751264AbdAXPaF (ORCPT ); Tue, 24 Jan 2017 10:30:05 -0500 Received: from mail.tpip.net ([92.43.49.48]:49108 "EHLO mail.tpip.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751117AbdAXP25 (ORCPT ); Tue, 24 Jan 2017 10:28:57 -0500 Received: from office.tpip.net (unknown [153.92.65.89]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mail.tpip.net (Postfix) with ESMTPS id 7F81F4F40D; Tue, 24 Jan 2017 15:28:55 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by office.tpip.net (Postfix) with ESMTP id 5A915A2CC2; Tue, 24 Jan 2017 16:28:55 +0100 (CET) Received: from office.tpip.net ([127.0.0.1]) by localhost (office.tpip.net [127.0.0.1]) (amavisd-new, port 10032) with ESMTP id ox2NI4VyjIIu; Tue, 24 Jan 2017 16:28:54 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by office.tpip.net (Postfix) with ESMTP id D27AEA2CC7; Tue, 24 Jan 2017 16:28:54 +0100 (CET) X-Virus-Scanned: amavisd-new at tpip.net Received: from office.tpip.net ([127.0.0.1]) by localhost (office.tpip.net [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id sv76-vyzJyRY; Tue, 24 Jan 2017 16:28:54 +0100 (CET) Received: from localhost.localdomain (pd95c9392.dip0.t-ipconnect.de [217.92.147.146]) by office.tpip.net (Postfix) with ESMTPSA id 8931AA2CC1; Tue, 24 Jan 2017 16:28:54 +0100 (CET) From: Andreas Schultz To: Pablo Neira Cc: netdev@vger.kernel.org, Lionel Gauthier , openbsc@lists.osmocom.org, Harald Welte Subject: [PATCH v2 09/18] gtp: use addr_hash when traversing pdp contexts Date: Tue, 24 Jan 2017 16:28:39 +0100 Message-Id: <20170124152848.6120-10-aschultz@tpip.net> X-Mailer: git-send-email 2.10.2 In-Reply-To: <20170124152848.6120-1-aschultz@tpip.net> References: <20170124152848.6120-1-aschultz@tpip.net> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org This prepares for the removal of the tid_hash from the device. Signed-off-by: Andreas Schultz --- drivers/net/gtp.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/gtp.c b/drivers/net/gtp.c index c117f63..c7e32a6 100644 --- a/drivers/net/gtp.c +++ b/drivers/net/gtp.c @@ -778,7 +778,7 @@ static void gtp_hashtable_free(struct gtp_dev *gtp) int i; for (i = 0; i < gtp->hash_size; i++) - hlist_for_each_entry_rcu(pctx, >p->tid_hash[i], hlist_tid) + hlist_for_each_entry_rcu(pctx, >p->addr_hash[i], hlist_addr) pdp_context_delete(pctx); synchronize_rcu(); @@ -1195,7 +1195,7 @@ static int gtp_genl_dump_pdp(struct sk_buff *skb, last_gtp = NULL; for (i = k; i < gtp->hash_size; i++) { - hlist_for_each_entry_rcu(pctx, >p->tid_hash[i], hlist_tid) { + hlist_for_each_entry_rcu(pctx, >p->addr_hash[i], hlist_addr) { if (tid && tid != pctx->u.tid) continue; else