diff options
author | <jgarzik@pretzel.yyz.us> | 2005-05-26 21:03:24 +0400 |
---|---|---|
committer | Jeff Garzik <jgarzik@pobox.com> | 2005-05-26 21:03:24 +0400 |
commit | 8973a585aec125beb2a3de50bb491004299f53d5 (patch) | |
tree | 3f069a9c7eff2c916e02427fd9800ce2b55a4a90 /net/xfrm/xfrm_algo.c | |
parent | 907f4678c114a125fe4584758681c31bf3d627da (diff) | |
parent | bef9c558841604116704e10b3d9ff3dbf4939423 (diff) | |
download | linux-8973a585aec125beb2a3de50bb491004299f53d5.tar.xz |
Automatic merge of rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git branch HEAD
Diffstat (limited to 'net/xfrm/xfrm_algo.c')
-rw-r--r-- | net/xfrm/xfrm_algo.c | 2 |
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 */ |