diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2017-04-04 12:31:12 +0300 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2017-04-04 12:31:12 +0300 |
| commit | 38bffdac071b720db627bfd2b125a2802a04d419 (patch) | |
| tree | c2e9cf66fa6ff1cc3092079e3eedeb4e6c402227 /net/ax25 | |
| parent | 57dd924e541a98219bf3a508623db2e0c07e75a7 (diff) | |
| parent | a481db34b9beb7a9647c23f2320dd38a2b1d681f (diff) | |
| download | linux-38bffdac071b720db627bfd2b125a2802a04d419.tar.xz | |
Merge branch 'sched/core' into locking/core
Required for the rtmutex/sched_deadline patches which depend on both
branches
Diffstat (limited to 'net/ax25')
| -rw-r--r-- | net/ax25/af_ax25.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/ax25/af_ax25.c b/net/ax25/af_ax25.c index a8e42cedf1db..b7c486752b3a 100644 --- 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; |