A-Team_Digital_Solutions/android_kernel_motorola_sm6375
Watch
2
0
Fork
You've already forked android_kernel_motorola_sm6375
 0
mirror of https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git synced 2026-10-29 11:11:45 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

Browse source 
Conflicts:
	drivers/net/ethernet/broadcom/genet/bcmgenet.c
	net/core/sock.c

Conflicts were overlapping changes in bcmgenet and the
lockdep handling of sockets.

Signed-off-by: David S. Miller <[email protected]>
This commit is contained in:
David S. Miller 2017-03-15 11:59:10 -07:00
commit 101c431492
590 changed files with 7664 additions and 3397 deletions
Download patch file Download diff file Expand all files Collapse all files

5
net/atm/svc.c
View file

@ -318,7 +318,8 @@ out:
return error;
}
static int svc_accept(struct socket *sock, struct socket *newsock, int flags)
static int svc_accept(struct socket *sock, struct socket *newsock, int flags,
bool kern)
{
struct sock *sk = sock->sk;
struct sk_buff *skb;
@ -329,7 +330,7 @@ static int svc_accept(struct socket *sock, struct socket *newsock, int flags)
lock_sock(sk);
error = svc_create(sock_net(sk), newsock, 0, 0);
error = svc_create(sock_net(sk), newsock, 0, kern);
if (error)
goto out;