diff options
| author | Ingo Molnar <mingo@kernel.org> | 2016-05-04 08:48:26 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2016-05-04 08:48:26 +0200 |
| commit | d63c214b0a39e7e92fbae2a47b66e8145c3c9c81 (patch) | |
| tree | ca797379eeb01c96308c8e2abdcea3b55040d489 /net/ipv6/udp.c | |
| parent | 47a541c3e19374ec9f5d3d96730a922e8480dda5 (diff) | |
| parent | 04974df8049fc4240d22759a91e035082ccd18b4 (diff) | |
| download | linux-d63c214b0a39e7e92fbae2a47b66e8145c3c9c81.tar.bz2 | |
Merge tag 'v4.6-rc6' into x86/platform, to refresh the tree
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'net/ipv6/udp.c')
| -rw-r--r-- | net/ipv6/udp.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/net/ipv6/udp.c b/net/ipv6/udp.c index fd25e447a5fa..6bc5c664fa46 100644 --- a/net/ipv6/udp.c +++ b/net/ipv6/udp.c @@ -843,8 +843,8 @@ start_lookup: flush_stack(stack, count, skb, count - 1); } else { if (!inner_flushed) - UDP_INC_STATS_BH(net, UDP_MIB_IGNOREDMULTI, - proto == IPPROTO_UDPLITE); + UDP6_INC_STATS_BH(net, UDP_MIB_IGNOREDMULTI, + proto == IPPROTO_UDPLITE); consume_skb(skb); } return 0; @@ -1539,6 +1539,7 @@ struct proto udpv6_prot = { .sendmsg = udpv6_sendmsg, .recvmsg = udpv6_recvmsg, .backlog_rcv = __udpv6_queue_rcv_skb, + .release_cb = ip6_datagram_release_cb, .hash = udp_lib_hash, .unhash = udp_lib_unhash, .rehash = udp_v6_rehash, |