diff options
| author | Amit Pundir <amit.pundir@linaro.org> | 2015-12-08 18:28:40 +0530 |
|---|---|---|
| committer | John Stultz <john.stultz@linaro.org> | 2016-02-16 13:51:22 -0800 |
| commit | 1af89c1ef3b64ef0b58c938e6bcc7d5e3415461b (patch) | |
| tree | 46d9d1dbece286e6afe0ae47c84d078eaf816c2a /include | |
| parent | b359cd6e67151763c2fc1988b897153b49316d14 (diff) | |
Hack: net: PPPoPNS and PPPoLAC build fixes for 4.1
Upstream commit c0371da6047a "put iov_iter into msghdr",
added iov_iter and removed direct access to scatter/gather
array elements in msghdr. It broke PPPoLAC and PPPoPNS.
Lets restore the direct access to scatter/gather array in
msghdr for the time being. Otherwise we run into following
build failure:
----------
drivers/net/ppp/pppolac.c: In function ‘pppolac_xmit_core’:
drivers/net/ppp/pppolac.c:210:4: error: unknown field ‘msg_iov’ specified in initializer
.msg_iov = (struct iovec *)&iov,
^
drivers/net/ppp/pppolac.c:211:4: error: unknown field ‘msg_iovlen’ specified in initializer
.msg_iovlen = 1,
^
make[3]: *** [drivers/net/ppp/pppolac.o] Error 1
----------
Change-Id: I2a1245a156da6d93b49f5cfd10506381b0eff005
Signed-off-by: Amit Pundir <amit.pundir@linaro.org>
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/socket.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/include/linux/socket.h b/include/linux/socket.h index 5bf59c8493b7..18a8337c8959 100644 --- a/include/linux/socket.h +++ b/include/linux/socket.h @@ -47,6 +47,10 @@ 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 */ |