diff options
| author | Karthikeyan Ramasubramanian <kramasub@codeaurora.org> | 2016-02-01 17:18:19 -0700 |
|---|---|---|
| committer | David Keitel <dkeitel@codeaurora.org> | 2016-03-22 11:08:01 -0700 |
| commit | bb3068325b72f0662168340f2dfc8d6cb690364b (patch) | |
| tree | 6d1371e2b6c9d9fb5ebf2752cc0c8b15943a8efa | |
| parent | 3f03fc9a6a3d57a1ba3191b5f6c82f4c0044de8f (diff) | |
net: ipc_router: Fix to handle the socket framework updates
Update the function signature of sendmsg and recvmsg operations.
Pass the kernel socket flag to the updated socket object allocation
function.
Signed-off-by: Karthikeyan Ramasubramanian <kramasub@codeaurora.org>
| -rw-r--r-- | net/ipc_router/ipc_router_socket.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/net/ipc_router/ipc_router_socket.c b/net/ipc_router/ipc_router_socket.c index 6e5259970b9e..088579139cf1 100644 --- a/net/ipc_router/ipc_router_socket.c +++ b/net/ipc_router/ipc_router_socket.c @@ -200,7 +200,7 @@ static int msm_ipc_router_create(struct net *net, return -EPROTOTYPE; } - sk = sk_alloc(net, AF_MSM_IPC, GFP_KERNEL, &msm_ipc_proto); + sk = sk_alloc(net, AF_MSM_IPC, GFP_KERNEL, &msm_ipc_proto, kern); if (!sk) { IPC_RTR_ERR("%s: sk_alloc failed\n", __func__); return -ENOMEM; @@ -311,7 +311,7 @@ static int ipc_router_connect(struct socket *sock, struct sockaddr *uaddr, return ret; } -static int msm_ipc_router_sendmsg(struct kiocb *iocb, struct socket *sock, +static int msm_ipc_router_sendmsg(struct socket *sock, struct msghdr *m, size_t total_len) { struct sock *sk = sock->sk; @@ -371,7 +371,7 @@ out_sendmsg: return ret; } -static int msm_ipc_router_recvmsg(struct kiocb *iocb, struct socket *sock, +static int msm_ipc_router_recvmsg(struct socket *sock, struct msghdr *m, size_t buf_len, int flags) { struct sock *sk = sock->sk; |