ipv6: tcp: fix TCLASS value in ACK messages sent from TIME_WAIT

[deliverable/linux.git] / net / ipv4 / cipso_ipv4.c

diff --git a/net/ipv4/cipso_ipv4.c b/net/ipv4/cipso_ipv4.c
index 2b3c23c287cdf343670195846f68b84f6ce02d4a..86f3b885b4f32c9de69cc809ba652fef0dfe9099 100644 (file)
--- a/net/ipv4/cipso_ipv4.c
+++ b/net/ipv4/cipso_ipv4.c
@@ -50,7 +50,7 @@
 #include <net/tcp.h>
 #include <net/netlabel.h>
 #include <net/cipso_ipv4.h>
-#include <asm/atomic.h>
+#include <linux/atomic.h>
 #include <asm/bug.h>
 #include <asm/unaligned.h>
 
@@ -476,7 +476,7 @@ int cipso_v4_doi_add(struct cipso_v4_doi *doi_def,
        doi = doi_def->doi;
        doi_type = doi_def->type;
 
-       if (doi_def == NULL || doi_def->doi == CIPSO_V4_DOI_UNKNOWN)
+       if (doi_def->doi == CIPSO_V4_DOI_UNKNOWN)
                goto doi_add_return;
        for (iter = 0; iter < CIPSO_V4_TAG_MAXCNT; iter++) {
                switch (doi_def->tags[iter]) {