From: Andreas Schultz <aschultz@tpip.net>
To: Pablo Neira <pablo@netfilter.org>
Cc: netdev@vger.kernel.org, Harald Welte <laforge@gnumonks.org>,
Lionel Gauthier <Lionel.Gauthier@eurecom.fr>,
openbsc@lists.osmocom.org
Subject: [PATCH 15/17] gtp: rename gtp hashtable helpers
Date: Mon, 23 Jan 2017 12:57:04 +0100 [thread overview]
Message-ID: <20170123115706.4354-16-aschultz@tpip.net> (raw)
In-Reply-To: <20170123115706.4354-1-aschultz@tpip.net>
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 <aschultz@tpip.net>
---
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;
--
2.10.2
next prev parent reply other threads:[~2017-01-23 12:06 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-01-23 11:56 [PATCH 00/17] gtp: fixes and support multiple VRF's per GTP socket Andreas Schultz
2017-01-23 11:56 ` [PATCH 01/17] gtp: add genl family modules alias Andreas Schultz
2017-01-23 11:56 ` [PATCH 02/17] gtp: clear DF bit on GTP packet tx Andreas Schultz
2017-01-23 11:56 ` [PATCH 03/17] gtp: make GTP sockets in gtp_newlink optional Andreas Schultz
2017-01-23 11:56 ` [PATCH 04/17] gtp: return error ptr in find pdp helpers Andreas Schultz
2017-01-23 11:56 ` [PATCH 05/17] gtp: unify genl_find_pdp and prepare for per socket lookup Andreas Schultz
2017-01-23 11:56 ` [PATCH 06/17] gtp: fix cross netns recv on gtp socket Andreas Schultz
2017-01-23 11:56 ` [PATCH 07/17] gtp: remove unnecessary rcu_read_lock Andreas Schultz
2017-01-23 11:56 ` [PATCH 08/17] gtp: consolidate pdp context destruction into helper Andreas Schultz
2017-01-23 11:56 ` [PATCH 09/17] gtp: use addr_hash when traversing pdp contexts Andreas Schultz
2017-01-23 11:56 ` [PATCH 10/17] gtp: add socket to pdp context Andreas Schultz
2017-01-23 11:57 ` [PATCH 11/17] gtp: consolidate gtp socket rx path Andreas Schultz
2017-01-23 11:57 ` [PATCH 12/17] gtp: let userspace handle packets for invalid tunnels Andreas Schultz
2017-01-23 11:57 ` [PATCH 13/17] gtp: replace netdev_dbg and KERN_DEBUG printk with pr_debug Andreas Schultz
2017-01-23 11:57 ` [PATCH 14/17] gtp: move TEID hash to per socket structure Andreas Schultz
2017-01-23 11:57 ` Andreas Schultz [this message]
2017-01-23 11:57 ` [PATCH 16/17] gtp: add genl cmd to enable GTP encapsulation on UDP socket Andreas Schultz
2017-01-23 11:57 ` [PATCH 17/17] gtp: add support to select a GTP socket during PDP context creation Andreas Schultz
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170123115706.4354-16-aschultz@tpip.net \
--to=aschultz@tpip.net \
--cc=Lionel.Gauthier@eurecom.fr \
--cc=laforge@gnumonks.org \
--cc=netdev@vger.kernel.org \
--cc=openbsc@lists.osmocom.org \
--cc=pablo@netfilter.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).