diff options
author | David S. Miller <davem@davemloft.net> | 2017-05-18 22:11:32 +0200 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2017-05-18 22:11:32 +0200 |
commit | c6cd850d6568872f66fc4a4582f34f9b910066ca (patch) | |
tree | e9a6370f7b0ce110e2916a6288a8fb0ee8323e37 /net/ipv6/udp.c | |
parent | net/mlx5e: Fix possible memory leak (diff) | |
parent | Merge tag 'md/4.12-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/shli/md (diff) | |
download | linux-c6cd850d6568872f66fc4a4582f34f9b910066ca.tar.xz linux-c6cd850d6568872f66fc4a4582f34f9b910066ca.zip |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Diffstat (limited to 'net/ipv6/udp.c')
-rw-r--r-- | net/ipv6/udp.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/ipv6/udp.c b/net/ipv6/udp.c index f78fdf8c9f0f..2e9b52bded2d 100644 --- a/net/ipv6/udp.c +++ b/net/ipv6/udp.c @@ -527,7 +527,7 @@ out: return; } -int __udpv6_queue_rcv_skb(struct sock *sk, struct sk_buff *skb) +static int __udpv6_queue_rcv_skb(struct sock *sk, struct sk_buff *skb) { int rc; @@ -570,7 +570,7 @@ void udpv6_encap_enable(void) } EXPORT_SYMBOL(udpv6_encap_enable); -int udpv6_queue_rcv_skb(struct sock *sk, struct sk_buff *skb) +static int udpv6_queue_rcv_skb(struct sock *sk, struct sk_buff *skb) { struct udp_sock *up = udp_sk(sk); int is_udplite = IS_UDPLITE(sk); |