summaryrefslogtreecommitdiff
path: root/net/core
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2008-12-18 09:11:38 +0300
committerDavid S. Miller <davem@davemloft.net>2008-12-18 09:11:38 +0300
commit49ad9599d42da4787d5b3a19263440e0fcd4d1fc (patch)
treebbeef6eb9316d30524aa73cf12580441f42e420a /net/core
parent3b5b35d02264580950d1e1565431b99d97c20ded (diff)
downloadlinux-49ad9599d42da4787d5b3a19263440e0fcd4d1fc.tar.xz
Revert "net: release skb->dst in sock_queue_rcv_skb()"
This reverts commit 70355602879229c6f8bd694ec9c0814222bc4936. As pointed out by Mark McLoughlin IP_PKTINFO cmsg data is one post-queueing user, so this optimization is not valid right now. Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/core')
-rw-r--r--net/core/sock.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/net/core/sock.c b/net/core/sock.c
index ac4f0e79226b..f3a0d08cbb48 100644
--- a/net/core/sock.c
+++ b/net/core/sock.c
@@ -289,11 +289,7 @@ int sock_queue_rcv_skb(struct sock *sk, struct sk_buff *skb)
skb->dev = NULL;
skb_set_owner_r(skb, sk);
- /*
- * release dst right now while its hot
- */
- dst_release(skb->dst);
- skb->dst = NULL;
+
/* Cache the SKB length before we tack it onto the receive
* queue. Once it is added it no longer belongs to us and
* may be freed by other threads of control pulling packets