diff options
| author | Paul Mackerras <paulus@samba.org> | 2006-02-28 00:35:24 -0500 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2006-02-28 00:35:24 -0500 |
| commit | 6749c5507388f3fc3719f57a54b540ee83f6661a (patch) | |
| tree | c069f990f86b020a14b50759d0c75475eedde186 /net/xfrm/xfrm_user.c | |
| parent | 2cf82c0256b198ae28c465f2c4d7c12c836ea5ea (diff) | |
| parent | 56ec6462af9cba56a04439154e5768672d6f390f (diff) | |
Merge ../powerpc-merge
Diffstat (limited to 'net/xfrm/xfrm_user.c')
| -rw-r--r-- | net/xfrm/xfrm_user.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/xfrm/xfrm_user.c b/net/xfrm/xfrm_user.c index ac87a09ba83e..7de17559249a 100644 --- a/net/xfrm/xfrm_user.c +++ b/net/xfrm/xfrm_user.c | |||
| @@ -345,7 +345,7 @@ static int xfrm_add_sa(struct sk_buff *skb, struct nlmsghdr *nlh, void **xfrma) | |||
| 345 | 345 | ||
| 346 | if (err < 0) { | 346 | if (err < 0) { |
| 347 | x->km.state = XFRM_STATE_DEAD; | 347 | x->km.state = XFRM_STATE_DEAD; |
| 348 | xfrm_state_put(x); | 348 | __xfrm_state_put(x); |
| 349 | goto out; | 349 | goto out; |
| 350 | } | 350 | } |
| 351 | 351 | ||