avr/qmk/firmware - [no description]

	Commit message (Expand)	Author	Age	Files	Lines
*	Fix uninitialized backlight_level in the Visualizer	Fred Sundvik	2017-07-10	1	-0/+4
*	Define visualizer thread priority by default	Fred Sundvik	2017-07-10	1	-1/+2
*	Whitefox LED control (#1432)	Ethan Madden	2017-06-25	1	-14/+19
*	Include config.h before visualizer.h	Fred Sundvik	2017-06-24	1	-1/+1
*	Correctly calculate backlight level	Fred Sundvik	2017-06-16	1	-1/+1
*	Backlight level handling for the visualizer	Fred Sundvik	2017-06-03	1	-1/+29
*	Let BACKLIGHT_ENABLE control the Infinity LEDs	Fred Sundvik	2017-06-03	1	-2/+2
*	Add automatic flush for the LCD screen	Fred Sundvik	2017-04-09	1	-0/+4
*	Move common visualizer keyframes into visualizer_keyframes.h	Fred Sundvik	2017-04-09	1	-6/+0
*	Remove the need to manually enable the visualizer	Fred Sundvik	2017-04-09	1	-13/+15
*	Separated backlight and LCD disable/enable	Fred Sundvik	2017-04-09	1	-21/+0
*	Move LCD backlight keyframes to its own file	Fred Sundvik	2017-04-09	1	-46/+0
*	Move LCD keyframes to its own file	Fred Sundvik	2017-04-09	1	-148/+2
*	Tweaks to the Ergodox default visualizer	Fred Sundvik	2017-04-09	1	-3/+25
*	Brightness for Ergodox Infinity emulated LEDs	Fred Sundvik	2017-04-09	1	-1/+1
*	Emulate Ergodox EZ leds by LCD colors	Fred Sundvik	2017-04-09	1	-1/+24
*	Display layer bitmap and keyboard led states on the LCD	Fred Sundvik	2017-04-09	1	-1/+37
*	added mods status bit to visualizer.	SjB	2017-01-17	1	-1/+57
*	Fix the SERIAL_LINK_ENABLE macro in Visualizer	Fred Sundvik	2016-07-07	1	-5/+5
*	Fix visualizer crash at startup	Fred Sundvik	2016-07-07	1	-2/+0
*	Makefile changes and files to compile Visualizer	Fred Sundvik	2016-07-07	1	-2/+0
*	Merge commit '73d890a2c9c34b905cd5e74e7146fdd4578dcb96' into add_visualizer	Fred Sundvik	2016-07-06	1	-18/+86
*	Add 'quantum/visualizer/' from commit 'bde869aa7ec8601459bc63b9636081d21108d1be'	Fred Sundvik	2016-07-06	1	-0/+481

--- a/include/net/netns/conntrack.h +++ b/include/net/netns/conntrack.h @@ -73,6 +73,7 @@ struct netns_ct { struct ctl_table_header *helper_sysctl_header; #endif char *slabname; + int skip_filter; unsigned int sysctl_log_invalid; /* Log invalid packets */ unsigned int sysctl_events_retry_timeout; int sysctl_events; --- a/net/ipv4/netfilter/iptable_filter.c +++ b/net/ipv4/netfilter/iptable_filter.c @@ -15,6 +15,7 @@ #include <linux/netfilter_ipv4/ip_tables.h> #include <linux/slab.h> #include <net/ip.h> +#include <net/netfilter/nf_conntrack.h> MODULE_LICENSE("GPL"); MODULE_AUTHOR("Netfilter Core Team <coreteam@netfilter.org>"); @@ -37,6 +38,7 @@ iptable_filter_hook(const struct nf_hook const struct net_device *in, const struct net_device *out, int (*okfn)(struct sk_buff *)) { + enum ip_conntrack_info ctinfo; const struct net *net; if (ops->hooknum == NF_INET_LOCAL_OUT && @@ -46,6 +48,11 @@ iptable_filter_hook(const struct nf_hook return NF_ACCEPT; net = dev_net((in != NULL) ? in : out); + nf_ct_get(skb, &ctinfo); + if ((ctinfo == IP_CT_ESTABLISHED_REPLY || ctinfo == IP_CT_ESTABLISHED) && + net->ct.skip_filter) + return NF_ACCEPT; + return ipt_do_table(skb, ops->hooknum, in, out, net->ipv4.iptable_filter); } --- a/net/ipv6/netfilter/ip6table_filter.c +++ b/net/ipv6/netfilter/ip6table_filter.c @@ -13,6 +13,7 @@ #include <linux/moduleparam.h> #include <linux/netfilter_ipv6/ip6_tables.h> #include <linux/slab.h> +#include <net/netfilter/nf_conntrack.h> MODULE_LICENSE("GPL"); MODULE_AUTHOR("Netfilter Core Team <coreteam@netfilter.org>"); @@ -37,6 +38,12 @@ ip6table_filter_hook(const struct nf_hoo int (*okfn)(struct sk_buff *)) { const struct net *net = dev_net((in != NULL) ? in : out); + enum ip_conntrack_info ctinfo; + + nf_ct_get(skb, &ctinfo); + if ((ctinfo == IP_CT_ESTABLISHED_REPLY || ctinfo == IP_CT_ESTABLISHED) && + net->ct.skip_filter) + return NF_ACCEPT; return ip6t_do_table(skb, ops->hooknum, in, out, net->ipv6.ip6table_filter); --- a/net/netfilter/nf_conntrack_standalone.c +++ b/net/netfilter/nf_conntrack_standalone.c @@ -510,6 +510,13 @@ static struct ctl_table nf_ct_sysctl_tab .extra2 = &log_invalid_proto_max, }, { + .procname = "nf_conntrack_skip_filter", + .data = &init_net.ct.skip_filter, + .maxlen = sizeof(int), + .mode = 0644, + .proc_handler = proc_dointvec, + }, + { .procname = "nf_conntrack_expect_max", .data = &nf_ct_expect_max, .maxlen = sizeof(int), @@ -545,6 +552,7 @@ static int nf_conntrack_standalone_init_ table[2].data = &net->ct.htable_size; table[3].data = &net->ct.sysctl_checksum; table[4].data = &net->ct.sysctl_log_invalid; + table[5].data = &net->ct.skip_filter; /* Don't export sysctls to unprivileged users */ if (net->user_ns != &init_user_ns)