Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

David S. Miller
2 parents a48eff1288 abb57ea48f
Showing 1 changed file Side-by-side Diff
net/core/skbuff.c
@@ -2993,6 +2993,9 @@
 	skb->destructor = sock_rmem_free;
 	atomic_add(skb->truesize, &sk->sk_rmem_alloc);
  
+	/* before exiting rcu section, make sure dst is refcounted */
+	skb_dst_force(skb);
+
 	skb_queue_tail(&sk->sk_error_queue, skb);
 	if (!sock_flag(sk, SOCK_DEAD))
 		sk->sk_data_ready(sk, skb->len);
...	...	@@ -2993,6 +2993,9 @@
2993	2993	skb->destructor = sock_rmem_free;
2994	2994	atomic_add(skb->truesize, &sk->sk_rmem_alloc);
2995	2995
	2996	+ /* before exiting rcu section, make sure dst is refcounted */
	2997	+ skb_dst_force(skb);
	2998	+
2996	2999	skb_queue_tail(&sk->sk_error_queue, skb);
2997	3000	if (!sock_flag(sk, SOCK_DEAD))
2998	3001	sk->sk_data_ready(sk, skb->len);