diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2016-09-13 05:43:53 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2016-09-13 05:43:53 -0700 |
| commit | 9ed8bfe3f2b22fedbd9f7eaa7ccb060851a3334e (patch) | |
| tree | e8795abd658511ebd52279c168f20dbf797d8c18 /include/linux/socket.h | |
| parent | d58d587e95f6d19f903a4e4c0cbd26cfcadb1f6c (diff) | |
| parent | c568eb7aca15625b4afdd922350b9b352ea78c2f (diff) | |
Merge "Merge branch 'tmp-bab1564' into msm-4.4"
Diffstat (limited to 'include/linux/socket.h')
| -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 */ |