aboutsummaryrefslogtreecommitdiffstats
path: root/net/xfrm/xfrm_algo.c
diff options
context:
space:
mode:
authorChristoph Hellwig <hch@hera.kernel.org>2005-05-27 04:16:24 -0400
committerChristoph Hellwig <hch@melbourne.sgi.com>2005-05-27 04:16:24 -0400
commitb19312c4c8f3f84da57bba01d45549df1cf10dcd (patch)
tree1c34ce89be6b4e257bc03026d0268deb17727044 /net/xfrm/xfrm_algo.c
parentd3870398fafd4911bd84573b78be4b6b762f32b0 (diff)
parent4ec5240ec367a592834385893200dd4fb369354c (diff)
Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Diffstat (limited to 'net/xfrm/xfrm_algo.c')
-rw-r--r--net/xfrm/xfrm_algo.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/xfrm/xfrm_algo.c b/net/xfrm/xfrm_algo.c
index 080aae243ce0..2f4531fcaca2 100644
--- a/net/xfrm/xfrm_algo.c
+++ b/net/xfrm/xfrm_algo.c
@@ -698,7 +698,7 @@ int skb_cow_data(struct sk_buff *skb, int tailbits, struct sk_buff **trailer)
698 return -ENOMEM; 698 return -ENOMEM;
699 699
700 if (skb1->sk) 700 if (skb1->sk)
701 skb_set_owner_w(skb, skb1->sk); 701 skb_set_owner_w(skb2, skb1->sk);
702 702
703 /* Looking around. Are we still alive? 703 /* Looking around. Are we still alive?
704 * OK, link new skb, drop old one */ 704 * OK, link new skb, drop old one */