projects
/
platform
/
kernel
/
linux-rpi.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'drm-fixes-4.11' of git://people.freedesktop.org/~agd5f/linux into drm...
[platform/kernel/linux-rpi.git]
/
net
/
ax25
/
af_ax25.c
diff --git
a/net/ax25/af_ax25.c
b/net/ax25/af_ax25.c
index
a8e42ce
..
b7c4867
100644
(file)
--- a/
net/ax25/af_ax25.c
+++ b/
net/ax25/af_ax25.c
@@
-1320,7
+1320,8
@@
out_release:
return err;
}
-static int ax25_accept(struct socket *sock, struct socket *newsock, int flags)
+static int ax25_accept(struct socket *sock, struct socket *newsock, int flags,
+ bool kern)
{
struct sk_buff *skb;
struct sock *newsk;