projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
net: SO_RCVMARK socket option for SO_MARK with recvmsg()
[linux-2.6-block.git]
/
net
/
atm
/
common.c
diff --git
a/net/atm/common.c
b/net/atm/common.c
index d0c8ab7ff8f6a8eaef31d2626739f3225ac59ad5..f7019df41c3e59658fcb4591389bb124e0c6d727 100644
(file)
--- a/
net/atm/common.c
+++ b/
net/atm/common.c
@@
-553,7
+553,7
@@
int vcc_recvmsg(struct socket *sock, struct msghdr *msg, size_t size,
error = skb_copy_datagram_msg(skb, 0, msg, copied);
if (error)
return error;
- sock_recv_
ts_and_drop
s(msg, sk, skb);
+ sock_recv_
cmsg
s(msg, sk, skb);
if (!(flags & MSG_PEEK)) {
pr_debug("%d -= %d\n", atomic_read(&sk->sk_rmem_alloc),