diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-10-09 03:02:35 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-10-09 03:02:35 -0400 |
| commit | 1236d6bb6e19fc72ffc6bbcdeb1bfefe450e54ee (patch) | |
| tree | 47da3feee8e263e8c9352c85cf518e624be3c211 /include/net/udp.h | |
| parent | 750b1a6894ecc9b178c6e3d0a1170122971b2036 (diff) | |
| parent | 8a5776a5f49812d29fe4b2d0a2d71675c3facf3f (diff) | |
Merge 4.14-rc4 into staging-next
We want the staging/iio fixes in here as well to handle merge issues.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'include/net/udp.h')
| -rw-r--r-- | include/net/udp.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/net/udp.h b/include/net/udp.h index 12dfbfe2e2d7..6c759c8594e2 100644 --- a/include/net/udp.h +++ b/include/net/udp.h | |||
| @@ -259,7 +259,7 @@ static inline struct sk_buff *skb_recv_udp(struct sock *sk, unsigned int flags, | |||
| 259 | return __skb_recv_udp(sk, flags, noblock, &peeked, &off, err); | 259 | return __skb_recv_udp(sk, flags, noblock, &peeked, &off, err); |
| 260 | } | 260 | } |
| 261 | 261 | ||
| 262 | void udp_v4_early_demux(struct sk_buff *skb); | 262 | int udp_v4_early_demux(struct sk_buff *skb); |
| 263 | bool udp_sk_rx_dst_set(struct sock *sk, struct dst_entry *dst); | 263 | bool udp_sk_rx_dst_set(struct sock *sk, struct dst_entry *dst); |
| 264 | int udp_get_port(struct sock *sk, unsigned short snum, | 264 | int udp_get_port(struct sock *sk, unsigned short snum, |
| 265 | int (*saddr_cmp)(const struct sock *, | 265 | int (*saddr_cmp)(const struct sock *, |