diff options
| author | Guenter Roeck <groeck@chromium.org> | 2016-03-01 09:44:17 -0800 |
|---|---|---|
| committer | Guenter Roeck <groeck@chromium.org> | 2016-03-02 19:22:53 +0000 |
| commit | 26fc40a09221330c574fa9cc06d0175273022e44 (patch) | |
| tree | 4dc1c8e38e294a44b37eb1e1ef8e7e6deb897c3a /include/linux | |
| parent | ee1a8e0fc3cb6ac300a47abc4beb211b0db47389 (diff) | |
net: pppolac/pppopns: Replace msg.msg_iov with iov_iter_kvec()
Commit 1af89c1ef3b6 ("Hack: net: PPPoPNS and PPPoLAC build fixes for 4.1")
fixed the build for PPPoPNS and PPPoLAC by re-introducing a field in
struct msghdr which was removed upstream. Re-introducing the field doesn't
get it used, so it is quite likely that the code never worked. Fix it up for
good.
Fixes: 1af89c1ef3b6 ("Hack: net: PPPoPNS and PPPoLAC build fixes for 4.1")
Signed-off-by: Guenter Roeck <groeck@chromium.org>
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/socket.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/include/linux/socket.h b/include/linux/socket.h index 18a8337c8959..5bf59c8493b7 100644 --- a/include/linux/socket.h +++ b/include/linux/socket.h @@ -47,10 +47,6 @@ struct linger { struct msghdr { void *msg_name; /* ptr to socket address structure */ int msg_namelen; /* size of socket address structure */ -#if defined(CONFIG_PPPOLAC) || defined(CONFIG_PPPOPNS) - struct iovec *msg_iov; /* scatter/gather array */ - __kernel_size_t msg_iovlen; /* # elements in msg_iov */ -#endif struct iov_iter msg_iter; /* data */ void *msg_control; /* ancillary data */ __kernel_size_t msg_controllen; /* ancillary data buffer length */ |