diff options
| author |   Tom Parkin <tparkin@katalix.com> | 2013-03-19 06:11:12 +0000 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2013-03-20 12:10:38 -0400 |
| commit | 44046a593eb770dbecdabf1c82bcd252f2a8337b (patch) | |
| tree | 1f8db140d6f920d0abad4a072c8f2d85a6e6ca9b /net/ipv6/udp.c | |
| parent | genetlink: trigger BUG_ON if a group name is too long (diff) | |
| download | linux-dev-44046a593eb770dbecdabf1c82bcd252f2a8337b.tar.xz linux-dev-44046a593eb770dbecdabf1c82bcd252f2a8337b.zip | |
udp: add encap_destroy callback
Users of udp encapsulation currently have an encap_rcv callback which they can
use to hook into the udp receive path.
In situations where a encapsulation user allocates resources associated with a
udp encap socket, it may be convenient to be able to also hook the proto
.destroy operation. For example, if an encap user holds a reference to the
udp socket, the destroy hook might be used to relinquish this reference.
This patch adds a socket destroy hook into udp, which is set and enabled
in the same way as the existing encap_rcv hook.
Signed-off-by: Tom Parkin <tparkin@katalix.com>
Signed-off-by: James Chapman <jchapman@katalix.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to '')
| -rw-r--r-- | net/ipv6/udp.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/net/ipv6/udp.c b/net/ipv6/udp.c index 599e1ba6d1ce..d8e5e852fc7a 100644 --- a/net/ipv6/udp.c +++ b/net/ipv6/udp.c @@ -1285,10 +1285,18 @@ do_confirm: void udpv6_destroy_sock(struct sock *sk) { + struct udp_sock *up = udp_sk(sk); lock_sock(sk); udp_v6_flush_pending_frames(sk); release_sock(sk); + if (static_key_false(&udpv6_encap_needed) && up->encap_type) { + void (*encap_destroy)(struct sock *sk); + encap_destroy = ACCESS_ONCE(up->encap_destroy); + if (encap_destroy) + encap_destroy(sk); + } + inet6_destroy_sock(sk); } |