aboutsummaryrefslogtreecommitdiffstats
path: root/net/packet
diff options
context:
space:
mode:
authorYing Xue <ying.xue@windriver.com>2015-03-02 02:37:48 -0500
committerDavid S. Miller <davem@davemloft.net>2015-03-02 13:06:31 -0500
commit1b784140474e4fc94281a49e96c67d29df0efbde (patch)
tree569e9813ae7ab79616849b117c6b50b3d6e4dabb /net/packet
parent39a0295f901423e260a034ac7c3211ecaa9c2745 (diff)
net: Remove iocb argument from sendmsg and recvmsg
After TIPC doesn't depend on iocb argument in its internal implementations of sendmsg() and recvmsg() hooks defined in proto structure, no any user is using iocb argument in them at all now. Then we can drop the redundant iocb argument completely from kinds of implementations of both sendmsg() and recvmsg() in the entire networking stack. Cc: Christoph Hellwig <hch@lst.de> Suggested-by: Al Viro <viro@ZenIV.linux.org.uk> Signed-off-by: Ying Xue <ying.xue@windriver.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/packet')
-rw-r--r--net/packet/af_packet.c11
1 files changed, 5 insertions, 6 deletions
diff --git a/net/packet/af_packet.c b/net/packet/af_packet.c
index 9db83693d736..404c9735aee9 100644
--- a/net/packet/af_packet.c
+++ b/net/packet/af_packet.c
@@ -1606,8 +1606,8 @@ oom:
1606 * protocol layers and you must therefore supply it with a complete frame 1606 * protocol layers and you must therefore supply it with a complete frame
1607 */ 1607 */
1608 1608
1609static int packet_sendmsg_spkt(struct kiocb *iocb, struct socket *sock, 1609static int packet_sendmsg_spkt(struct socket *sock, struct msghdr *msg,
1610 struct msghdr *msg, size_t len) 1610 size_t len)
1611{ 1611{
1612 struct sock *sk = sock->sk; 1612 struct sock *sk = sock->sk;
1613 DECLARE_SOCKADDR(struct sockaddr_pkt *, saddr, msg->msg_name); 1613 DECLARE_SOCKADDR(struct sockaddr_pkt *, saddr, msg->msg_name);
@@ -2601,8 +2601,7 @@ out:
2601 return err; 2601 return err;
2602} 2602}
2603 2603
2604static int packet_sendmsg(struct kiocb *iocb, struct socket *sock, 2604static int packet_sendmsg(struct socket *sock, struct msghdr *msg, size_t len)
2605 struct msghdr *msg, size_t len)
2606{ 2605{
2607 struct sock *sk = sock->sk; 2606 struct sock *sk = sock->sk;
2608 struct packet_sock *po = pkt_sk(sk); 2607 struct packet_sock *po = pkt_sk(sk);
@@ -2882,8 +2881,8 @@ out:
2882 * If necessary we block. 2881 * If necessary we block.
2883 */ 2882 */
2884 2883
2885static int packet_recvmsg(struct kiocb *iocb, struct socket *sock, 2884static int packet_recvmsg(struct socket *sock, struct msghdr *msg, size_t len,
2886 struct msghdr *msg, size_t len, int flags) 2885 int flags)
2887{ 2886{
2888 struct sock *sk = sock->sk; 2887 struct sock *sk = sock->sk;
2889 struct sk_buff *skb; 2888 struct sk_buff *skb;