summaryrefslogtreecommitdiff
path: root/net/xfrm/xfrm_algo.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@ppc970.osdl.org>2005-05-19 15:29:23 -0700
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-05-19 15:29:23 -0700
commit804c64ea864d0a8ee13f3de0b74158a3e9c3166d (patch)
tree842b223e9db75ece9f4e2a5daf0f519b07b4a92a /net/xfrm/xfrm_algo.c
parent49a43876b935c811cfd29d8fe998a6912a1cc5c4 (diff)
parentaa1c6a6f7f0518b42994d02756a41cbfdcac1916 (diff)
Merge of rsync://rsync.kernel.org/pub/scm/linux/kernel/git/davem/net-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)
return -ENOMEM;
if (skb1->sk)
- skb_set_owner_w(skb, skb1->sk);
+ skb_set_owner_w(skb2, skb1->sk);
/* Looking around. Are we still alive?
* OK, link new skb, drop old one */