diff options
| author | Brian Norris <computersforpeace@gmail.com> | 2017-06-01 14:24:24 -0400 |
|---|---|---|
| committer | Brian Norris <computersforpeace@gmail.com> | 2017-06-01 14:24:24 -0400 |
| commit | e3db1289e7432a882823a7effc474aff78868489 (patch) | |
| tree | 79188812b29602fe3b3641d55c32cfdc2101f0ef /net/ipv6/udp_impl.h | |
| parent | c316cf670491def52a396d3bdc5a63ad01f7fefa (diff) | |
| parent | 05e97a9eda72d58dba293857df6aac62584ef99a (diff) | |
Merge MTD fixes into -next
Diffstat (limited to 'net/ipv6/udp_impl.h')
| -rw-r--r-- | net/ipv6/udp_impl.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/net/ipv6/udp_impl.h b/net/ipv6/udp_impl.h index e78bdc76dcc3..f180b3d85e31 100644 --- a/net/ipv6/udp_impl.h +++ b/net/ipv6/udp_impl.h | |||
| @@ -26,7 +26,6 @@ int compat_udpv6_getsockopt(struct sock *sk, int level, int optname, | |||
| 26 | int udpv6_sendmsg(struct sock *sk, struct msghdr *msg, size_t len); | 26 | int udpv6_sendmsg(struct sock *sk, struct msghdr *msg, size_t len); |
| 27 | int udpv6_recvmsg(struct sock *sk, struct msghdr *msg, size_t len, int noblock, | 27 | int udpv6_recvmsg(struct sock *sk, struct msghdr *msg, size_t len, int noblock, |
| 28 | int flags, int *addr_len); | 28 | int flags, int *addr_len); |
| 29 | int __udpv6_queue_rcv_skb(struct sock *sk, struct sk_buff *skb); | ||
| 30 | void udpv6_destroy_sock(struct sock *sk); | 29 | void udpv6_destroy_sock(struct sock *sk); |
| 31 | 30 | ||
| 32 | #ifdef CONFIG_PROC_FS | 31 | #ifdef CONFIG_PROC_FS |