Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
This commit is contained in:
@@ -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);
|
||||
|
Reference in New Issue
Block a user