From d98db41c86a56c4ba8fe83eb2e5cafe120c7b7a6 Mon Sep 17 00:00:00 2001
From: Yasuyuki Kozakai <yasuyuki.kozakai@toshiba.co.jp>
Date: Wed, 24 Sep 2008 15:53:39 -0700
Subject: [PATCH] --- yaml --- r: 110031 b: refs/heads/master c:
 8ca31ce52a5cfd03b960fd81a49197ae85d25347 h: refs/heads/master i:   110029:
 abe9f4d5700b725623d7abc72b827aa0517052ef   110027:
 2fcdb0602e1d74031859e89b05f00861a0e70b2e   110023:
 1794f8a3e3a4c521047ade9852ed563594b39d9b   110015:
 71b4f73157132dd36b4c1f53f6d686793adf8208 v: v3

---
 [refs]                              | 2 +-
 trunk/net/ipv6/netfilter/ip6t_hbh.c | 8 ++++++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 6b846ea7ae48..e07c2ecb558f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5fbcd260c2c52f78cd699f65e9c7af2e60b5380c
+refs/heads/master: 8ca31ce52a5cfd03b960fd81a49197ae85d25347
diff --git a/trunk/net/ipv6/netfilter/ip6t_hbh.c b/trunk/net/ipv6/netfilter/ip6t_hbh.c
index 62e39ace0588..26654b26d7fa 100644
--- a/trunk/net/ipv6/netfilter/ip6t_hbh.c
+++ b/trunk/net/ipv6/netfilter/ip6t_hbh.c
@@ -97,8 +97,6 @@ hbh_mt6(const struct sk_buff *skb, const struct net_device *in,
 	hdrlen -= 2;
 	if (!(optinfo->flags & IP6T_OPTS_OPTS)) {
 		return ret;
-	} else if (optinfo->flags & IP6T_OPTS_NSTRICT) {
-		pr_debug("Not strict - not implemented");
 	} else {
 		pr_debug("Strict ");
 		pr_debug("#%d ", optinfo->optsnr);
@@ -177,6 +175,12 @@ hbh_mt6_check(const char *tablename, const void *entry,
 		pr_debug("ip6t_opts: unknown flags %X\n", optsinfo->invflags);
 		return false;
 	}
+
+	if (optsinfo->flags & IP6T_OPTS_NSTRICT) {
+		pr_debug("ip6t_opts: Not strict - not implemented");
+		return false;
+	}
+
 	return true;
 }