diff options
author | David S. Miller <davem@davemloft.net> | 2016-11-27 05:42:21 +0100 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2016-11-27 05:42:21 +0100 |
commit | 0b42f25d2f123bb7fbd3565d003a8ea9e1e810fe (patch) | |
tree | 77856ad061e97e86027df1fa6efdf20a9fe309b5 /net/ipv4/udp.c | |
parent | Merge branch 'mlxsw-trap-groups-and-policers' (diff) | |
parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/vir... (diff) | |
download | linux-0b42f25d2f123bb7fbd3565d003a8ea9e1e810fe.tar.xz linux-0b42f25d2f123bb7fbd3565d003a8ea9e1e810fe.zip |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
udplite conflict is resolved by taking what 'net-next' did
which removed the backlog receive method assignment, since
it is no longer necessary.
Two entries were added to the non-priv ethtool operations
switch statement, one in 'net' and one in 'net-next, so
simple overlapping changes.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/udp.c')
-rw-r--r-- | net/ipv4/udp.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv4/udp.c b/net/ipv4/udp.c index b3b6bc5b9731..e1d0bf8eba4b 100644 --- a/net/ipv4/udp.c +++ b/net/ipv4/udp.c @@ -1562,7 +1562,7 @@ static void udp_v4_rehash(struct sock *sk) udp_lib_rehash(sk, new_hash); } -static int __udp_queue_rcv_skb(struct sock *sk, struct sk_buff *skb) +int __udp_queue_rcv_skb(struct sock *sk, struct sk_buff *skb) { int rc; |