aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2008-09-24 16:45:07 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2008-09-24 16:45:07 -0700
commitefba91bd9066890ae93270eb3d0e55de43368f0b (patch)
tree6c39afc6cd3529e20da0c544078717fca8a4d1d6 /net
parent26591188d69192d5babeadde129dcfb6cbf9e6b7 (diff)
parent8c65859473baee85e806ec8ebc0ff5e3a181969e (diff)
downloadkernel_samsung_smdk4412-efba91bd9066890ae93270eb3d0e55de43368f0b.zip
kernel_samsung_smdk4412-efba91bd9066890ae93270eb3d0e55de43368f0b.tar.gz
kernel_samsung_smdk4412-efba91bd9066890ae93270eb3d0e55de43368f0b.tar.bz2
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: netfilter: ip6t_{hbh,dst}: Rejects not-strict mode on rule insertion ath9k: disable MIB interrupts to fix interrupt storm [Bluetooth] Fix USB disconnect handling of btusb driver [Bluetooth] Fix wrong URB handling of btusb driver [Bluetooth] Fix I/O errors on MacBooks with Broadcom chips
Diffstat (limited to 'net')
-rw-r--r--net/ipv6/netfilter/ip6t_hbh.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/net/ipv6/netfilter/ip6t_hbh.c b/net/ipv6/netfilter/ip6t_hbh.c
index 62e39ac..26654b2 100644
--- a/net/ipv6/netfilter/ip6t_hbh.c
+++ b/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;
}