diff options
| author | Andreas Schultz <aschultz@tpip.net> | 2017-03-09 17:43:01 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-03-13 13:04:31 -0700 |
| commit | 6b5e2e7401de30903ad05d3ef18e3a72d835ce24 (patch) | |
| tree | 1138948b311fbd65a3d498114bb7a3ae677db5d7 /drivers/net/gtp.c | |
| parent | d9e2dd122637034a0697bf268eed9233701b9dca (diff) | |
| download | linux-stable-6b5e2e7401de30903ad05d3ef18e3a72d835ce24.tar.gz linux-stable-6b5e2e7401de30903ad05d3ef18e3a72d835ce24.tar.bz2 linux-stable-6b5e2e7401de30903ad05d3ef18e3a72d835ce24.zip | |
gtp: consolidate pdp context destruction into helper
Consolidate duplicate code into helper.
Signed-off-by: Andreas Schultz <aschultz@tpip.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/gtp.c')
| -rw-r--r-- | drivers/net/gtp.c | 24 |
1 files changed, 14 insertions, 10 deletions
diff --git a/drivers/net/gtp.c b/drivers/net/gtp.c index bf4b352e06c4..d58f46fd766a 100644 --- a/drivers/net/gtp.c +++ b/drivers/net/gtp.c @@ -86,6 +86,8 @@ struct gtp_net { static u32 gtp_h_initval; +static void pdp_context_delete(struct pdp_ctx *pctx); + static inline u32 gtp0_hashfn(u64 tid) { u32 *tid32 = (u32 *) &tid; @@ -780,13 +782,10 @@ static void gtp_hashtable_free(struct gtp_dev *gtp) struct pdp_ctx *pctx; int i; - for (i = 0; i < gtp->hash_size; i++) { - hlist_for_each_entry_rcu(pctx, >p->tid_hash[i], hlist_tid) { - hlist_del_rcu(&pctx->hlist_tid); - hlist_del_rcu(&pctx->hlist_addr); - kfree_rcu(pctx, rcu_head); - } - } + for (i = 0; i < gtp->hash_size; i++) + hlist_for_each_entry_rcu(pctx, >p->tid_hash[i], hlist_tid) + pdp_context_delete(pctx); + synchronize_rcu(); kfree(gtp->addr_hash); kfree(gtp->tid_hash); @@ -995,6 +994,13 @@ static int ipv4_pdp_add(struct gtp_dev *gtp, struct genl_info *info) return 0; } +static void pdp_context_delete(struct pdp_ctx *pctx) +{ + hlist_del_rcu(&pctx->hlist_tid); + hlist_del_rcu(&pctx->hlist_addr); + kfree_rcu(pctx, rcu_head); +} + static int gtp_genl_new_pdp(struct sk_buff *skb, struct genl_info *info) { struct gtp_dev *gtp; @@ -1100,9 +1106,7 @@ static int gtp_genl_del_pdp(struct sk_buff *skb, struct genl_info *info) netdev_dbg(pctx->dev, "GTPv1-U: deleting tunnel id = %x/%x (pdp %p)\n", pctx->u.v1.i_tei, pctx->u.v1.o_tei, pctx); - hlist_del_rcu(&pctx->hlist_tid); - hlist_del_rcu(&pctx->hlist_addr); - kfree_rcu(pctx, rcu_head); + pdp_context_delete(pctx); out_unlock: rcu_read_unlock(); |