diff options
| author | <jgarzik@pretzel.yyz.us> | 2005-05-27 22:08:07 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-05-27 22:08:07 -0400 |
| commit | 51a730d758ae4052e10ca7e06336f10af598c4fc (patch) | |
| tree | b76a004c00cd7139659be515ee03398e47067290 /net/xfrm/xfrm_algo.c | |
| parent | 6cd15a9daf826115356f9403494c76e5aafa7793 (diff) | |
| parent | ff0e0ea2f5d36fa90fc2c57fd019102b0a0cfabf (diff) | |
Automatic merge of /spare/repo/netdev-2.6 branch we18-ieee80211
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) | |||
| 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 */ |