From patchwork Mon Jan 23 11:57:04 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Schultz X-Patchwork-Id: 718469 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 3v6VS56pNlz9ryQ for ; Mon, 23 Jan 2017 23:07:33 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751182AbdAWMHb (ORCPT ); Mon, 23 Jan 2017 07:07:31 -0500 Received: from mail.tpip.net ([92.43.49.48]:47333 "EHLO mail.tpip.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751004AbdAWMGy (ORCPT ); Mon, 23 Jan 2017 07:06:54 -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 CF3604F414; Mon, 23 Jan 2017 11:57:14 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by office.tpip.net (Postfix) with ESMTP id A8AF7A2C94; Mon, 23 Jan 2017 12:57:14 +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 1OfRmiK_ZiP1; Mon, 23 Jan 2017 12:57:14 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by office.tpip.net (Postfix) with ESMTP id 4FF42A2C97; Mon, 23 Jan 2017 12:57:14 +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 fh3V448XL3CU; Mon, 23 Jan 2017 12:57:14 +0100 (CET) Received: from localhost.localdomain (pd95c9392.dip0.t-ipconnect.de [217.92.147.146]) by office.tpip.net (Postfix) with ESMTPSA id 07D94A2C6B; Mon, 23 Jan 2017 12:57:14 +0100 (CET) From: Andreas Schultz To: Pablo Neira Cc: netdev@vger.kernel.org, Harald Welte , Lionel Gauthier , openbsc@lists.osmocom.org Subject: [PATCH 15/17] gtp: rename gtp hashtable helpers Date: Mon, 23 Jan 2017 12:57:04 +0100 Message-Id: <20170123115706.4354-16-aschultz@tpip.net> X-Mailer: git-send-email 2.10.2 In-Reply-To: <20170123115706.4354-1-aschultz@tpip.net> References: <20170123115706.4354-1-aschultz@tpip.net> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org The gtp_hashtable helper are now olny used for the per netdevice address hashes. Rename them to make their purpose clearer. Signed-off-by: Andreas Schultz --- drivers/net/gtp.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/drivers/net/gtp.c b/drivers/net/gtp.c index 019e80f..55bf098 100644 --- a/drivers/net/gtp.c +++ b/drivers/net/gtp.c @@ -618,8 +618,8 @@ static void gtp_link_setup(struct net_device *dev) sizeof(struct gtp0_header); } -static int gtp_hashtable_new(struct gtp_dev *gtp, int hsize); -static void gtp_hashtable_free(struct gtp_dev *gtp); +static int gtp_dev_hashtable_new(struct gtp_dev *gtp, int hsize); +static void gtp_dev_hashtable_free(struct gtp_dev *gtp); static int gtp_encap_enable(struct net_device *dev, struct gtp_dev *gtp, int hsize, struct nlattr *data[]); static void gtp_encap_disable(struct gtp_dev *gtp); @@ -644,7 +644,7 @@ static int gtp_newlink(struct net *src_net, struct net_device *dev, goto out_err; } - err = gtp_hashtable_new(gtp, hashsize); + err = gtp_dev_hashtable_new(gtp, hashsize); if (err < 0) goto out_socket; @@ -662,7 +662,7 @@ static int gtp_newlink(struct net *src_net, struct net_device *dev, return 0; out_hashtable: - gtp_hashtable_free(gtp); + gtp_dev_hashtable_free(gtp); out_socket: gtp_encap_disable(gtp); out_err: @@ -673,7 +673,7 @@ static void gtp_dellink(struct net_device *dev, struct list_head *head) { struct gtp_dev *gtp = netdev_priv(dev); - gtp_hashtable_free(gtp); + gtp_dev_hashtable_free(gtp); if (gtp->sock0) sockfd_put(gtp->sock0); if (gtp->sock1u) @@ -742,7 +742,7 @@ static struct net *gtp_genl_get_net(struct net *src_net, struct nlattr *tb[]) return net; } -static int gtp_hashtable_new(struct gtp_dev *gtp, int hsize) +static int gtp_dev_hashtable_new(struct gtp_dev *gtp, int hsize) { int i; @@ -758,7 +758,7 @@ static int gtp_hashtable_new(struct gtp_dev *gtp, int hsize) return 0; } -static void gtp_hashtable_free(struct gtp_dev *gtp) +static void gtp_dev_hashtable_free(struct gtp_dev *gtp) { struct pdp_ctx *pctx; int i;