Merge branch 'misc.namei' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

[linux-2.6-microblaze.git] / net / ipv4 / cipso_ipv4.c

diff --git a/net/ipv4/cipso_ipv4.c b/net/ipv4/cipso_ipv4.c
index 7fbd0b5..099259f 100644 (file)
--- a/net/ipv4/cipso_ipv4.c
+++ b/net/ipv4/cipso_ipv4.c
@@ -465,16 +465,14 @@ void cipso_v4_doi_free(struct cipso_v4_doi *doi_def)
        if (!doi_def)
                return;
 
-       if (doi_def->map.std) {
-               switch (doi_def->type) {
-               case CIPSO_V4_MAP_TRANS:
-                       kfree(doi_def->map.std->lvl.cipso);
-                       kfree(doi_def->map.std->lvl.local);
-                       kfree(doi_def->map.std->cat.cipso);
-                       kfree(doi_def->map.std->cat.local);
-                       kfree(doi_def->map.std);
-                       break;
-               }
+       switch (doi_def->type) {
+       case CIPSO_V4_MAP_TRANS:
+               kfree(doi_def->map.std->lvl.cipso);
+               kfree(doi_def->map.std->lvl.local);
+               kfree(doi_def->map.std->cat.cipso);
+               kfree(doi_def->map.std->cat.local);
+               kfree(doi_def->map.std);
+               break;
        }
        kfree(doi_def);
 }