Skip to content

Commit 48f2c50

Browse files
author
Xin Long
committed
inet6: Remove inet6_destroy_sock().
Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=2160516 Tested: compile only commit 1f8c4ee Author: Kuniyuki Iwashima <kuniyu@amazon.com> Date: Wed Oct 19 15:36:02 2022 -0700 inet6: Remove inet6_destroy_sock(). The last user of inet6_destroy_sock() is its wrapper inet6_cleanup_sock(). Let's rename inet6_destroy_sock() to inet6_cleanup_sock(). Signed-off-by: Kuniyuki Iwashima <kuniyu@amazon.com> Signed-off-by: David S. Miller <davem@davemloft.net> Signed-off-by: Xin Long <lxin@redhat.com>
1 parent 298fbb8 commit 48f2c50

File tree

2 files changed

+1
-9
lines changed

2 files changed

+1
-9
lines changed

include/net/transp_v6.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,8 +56,6 @@ ip6_dgram_sock_seq_show(struct seq_file *seq, struct sock *sp, __u16 srcp,
5656

5757
#define LOOPBACK4_IPV6 cpu_to_be32(0x7f000006)
5858

59-
void inet6_destroy_sock(struct sock *sk);
60-
6159
#define IPV6_SEQ_DGRAM_HEADER \
6260
" sl " \
6361
"local_address " \

net/ipv6/af_inet6.c

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -492,7 +492,7 @@ int inet6_release(struct socket *sock)
492492
}
493493
EXPORT_SYMBOL(inet6_release);
494494

495-
void inet6_destroy_sock(struct sock *sk)
495+
void inet6_cleanup_sock(struct sock *sk)
496496
{
497497
struct ipv6_pinfo *np = inet6_sk(sk);
498498
struct sk_buff *skb;
@@ -517,12 +517,6 @@ void inet6_destroy_sock(struct sock *sk)
517517
txopt_put(opt);
518518
}
519519
}
520-
EXPORT_SYMBOL_GPL(inet6_destroy_sock);
521-
522-
void inet6_cleanup_sock(struct sock *sk)
523-
{
524-
inet6_destroy_sock(sk);
525-
}
526520
EXPORT_SYMBOL_GPL(inet6_cleanup_sock);
527521

528522
/*

0 commit comments

Comments
 (0)