Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
This commit is contained in:
@@ -1727,7 +1727,7 @@ static void udp_v4_rehash(struct sock *sk)
|
||||
udp_lib_rehash(sk, new_hash);
|
||||
}
|
||||
|
||||
int __udp_queue_rcv_skb(struct sock *sk, struct sk_buff *skb)
|
||||
static int __udp_queue_rcv_skb(struct sock *sk, struct sk_buff *skb)
|
||||
{
|
||||
int rc;
|
||||
|
||||
@@ -1772,7 +1772,7 @@ EXPORT_SYMBOL(udp_encap_enable);
|
||||
* Note that in the success and error cases, the skb is assumed to
|
||||
* have either been requeued or freed.
|
||||
*/
|
||||
int udp_queue_rcv_skb(struct sock *sk, struct sk_buff *skb)
|
||||
static int udp_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