diff options
| author | Dan Williams <dan.j.williams@intel.com> | 2017-04-13 00:59:01 -0400 |
|---|---|---|
| committer | Dan Williams <dan.j.williams@intel.com> | 2017-04-13 00:59:01 -0400 |
| commit | bfca9acf1a5df0ff98fbf47e363adb48612bb7ec (patch) | |
| tree | a50287c88fdc60a73912d205d7bce41b7af53827 /include/linux/net.h | |
| parent | 92a3fa075d3d2716b9c662814540f1d660cbf2f5 (diff) | |
| parent | 11e63f6d920d6f2dfd3cd421e939a4aec9a58dcd (diff) | |
Merge branch 'for-4.11/libnvdimm' into for-4.12/dax
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 { | |||
| 146 | int (*socketpair)(struct socket *sock1, | 146 | int (*socketpair)(struct socket *sock1, |
| 147 | struct socket *sock2); | 147 | struct socket *sock2); |
| 148 | int (*accept) (struct socket *sock, | 148 | int (*accept) (struct socket *sock, |
| 149 | struct socket *newsock, int flags); | 149 | struct socket *newsock, int flags, bool kern); |
| 150 | int (*getname) (struct socket *sock, | 150 | int (*getname) (struct socket *sock, |
| 151 | struct sockaddr *addr, | 151 | struct sockaddr *addr, |
| 152 | int *sockaddr_len, int peer); | 152 | int *sockaddr_len, int peer); |