diff options
| author | Al Viro <viro@zeniv.linux.org.uk> | 2017-04-03 01:06:59 -0400 | 
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2017-04-03 01:06:59 -0400 | 
| commit | a8e28440016bfb23bec266c4c66eacca6ea2d48b (patch) | |
| tree | 27d528294f7886c434c8072a034d211acc06d077 /include/linux/net.h | |
| parent | 2b5efc089769cd2aa583880d29416d00e7441f39 (diff) | |
| parent | 3209f68b3ca4667069923a325c88b21131bfdf9f (diff) | |
Merge branch 'work.statx' into for-next
Diffstat (limited to 'include/linux/net.h')
| -rw-r--r-- | include/linux/net.h | 2 | 
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/net.h b/include/linux/net.h index cd0c8bd0a1de..0620f5e18c96 100644 --- a/include/linux/net.h +++ b/include/linux/net.h @@ -146,7 +146,7 @@ struct proto_ops {  	int		(*socketpair)(struct socket *sock1,  				      struct socket *sock2);  	int		(*accept)    (struct socket *sock, -				      struct socket *newsock, int flags); +				      struct socket *newsock, int flags, bool kern);  	int		(*getname)   (struct socket *sock,  				      struct sockaddr *addr,  				      int *sockaddr_len, int peer);  | 
