diff options
| author | Paul Mackerras <paulus@samba.org> | 2005-11-10 11:06:04 +1100 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2005-11-10 11:06:04 +1100 |
| commit | 31e7f1ff3c5d39a70da85f7d81a1ab1f4e64fa97 (patch) | |
| tree | a6cb8f14b1182e5dce55d13e52c1182a8c7e0402 /net/ipv4/ip_options.c | |
| parent | fca5dcd4835ed09bb1a48a355344aff7a25c76e0 (diff) | |
| parent | 6730c3c14421b7c924d06e31bb66e0adad225547 (diff) | |
| download | linux-31e7f1ff3c5d39a70da85f7d81a1ab1f4e64fa97.tar.gz linux-31e7f1ff3c5d39a70da85f7d81a1ab1f4e64fa97.tar.bz2 linux-31e7f1ff3c5d39a70da85f7d81a1ab1f4e64fa97.zip | |
Merge ../linux-2.6
Diffstat (limited to 'net/ipv4/ip_options.c')
| -rw-r--r-- | net/ipv4/ip_options.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/net/ipv4/ip_options.c b/net/ipv4/ip_options.c index bce4e875193b..dbe12da8d8b3 100644 --- a/net/ipv4/ip_options.c +++ b/net/ipv4/ip_options.c @@ -510,8 +510,7 @@ static int ip_options_get_finish(struct ip_options **optp, kfree(opt); return -EINVAL; } - if (*optp) - kfree(*optp); + kfree(*optp); *optp = opt; return 0; } |