summaryrefslogtreecommitdiffstats
path: root/net/ipv6/ipcomp6.c
diff options
context:
space:
mode:
authorDmitry Torokhov <dtor_core@ameritech.net>2005-09-10 03:14:47 +0200
committerDmitry Torokhov <dtor_core@ameritech.net>2005-09-10 03:14:47 +0200
commitd344c5e0856ad03278d8700b503762dbc8b86e12 (patch)
treea6d893a643470a3c2580a58f3228a55fa1fd1d82 /net/ipv6/ipcomp6.c
parentInput: HIDDEV - make HIDIOCSREPORT wait IO completion (diff)
parent[PATCH] md: fix BUG when raid10 rebuilds without enough drives (diff)
downloadlinux-d344c5e0856ad03278d8700b503762dbc8b86e12.tar.xz
linux-d344c5e0856ad03278d8700b503762dbc8b86e12.zip
Manual merge with Linus
Diffstat (limited to 'net/ipv6/ipcomp6.c')
-rw-r--r--net/ipv6/ipcomp6.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/net/ipv6/ipcomp6.c b/net/ipv6/ipcomp6.c
index 135383ef538f..85bfbc69b2c3 100644
--- a/net/ipv6/ipcomp6.c
+++ b/net/ipv6/ipcomp6.c
@@ -341,8 +341,7 @@ static void ipcomp6_free_tfms(struct crypto_tfm **tfms)
for_each_cpu(cpu) {
struct crypto_tfm *tfm = *per_cpu_ptr(tfms, cpu);
- if (tfm)
- crypto_free_tfm(tfm);
+ crypto_free_tfm(tfm);
}
free_percpu(tfms);
}