Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-next-2.6 (b5bb1438) · Commits · e / devices / android_kernel_oneplus_sm7250

drivers/leds/Kconfig

+3 −0

Original line number	Diff line number	Diff line
		@@ -223,4 +223,7 @@ config LEDS_TRIGGER_DEFAULT_ON
		This allows LEDs to be initialised in the ON state.
		If unsure, say Y.

		comment "iptables trigger is under Netfilter config (LED target)"
		depends on LEDS_TRIGGERS

		endif # NEW_LEDS

+8 −0

Original line number	Diff line number	Diff line
		@@ -7,16 +7,21 @@ header-y += xt_CLASSIFY.h
		header-y += xt_CONNMARK.h
		header-y += xt_CONNSECMARK.h
		header-y += xt_DSCP.h
		header-y += xt_LED.h
		header-y += xt_MARK.h
		header-y += xt_NFLOG.h
		header-y += xt_NFQUEUE.h
		header-y += xt_RATEEST.h
		header-y += xt_SECMARK.h
		header-y += xt_TCPMSS.h
		header-y += xt_TCPOPTSTRIP.h
		header-y += xt_TPROXY.h
		header-y += xt_comment.h
		header-y += xt_connbytes.h
		header-y += xt_connlimit.h
		header-y += xt_connmark.h
		header-y += xt_conntrack.h
		header-y += xt_cluster.h
		header-y += xt_dccp.h
		header-y += xt_dscp.h
		header-y += xt_esp.h
		@@ -30,6 +35,7 @@ header-y += xt_mark.h
		header-y += xt_multiport.h
		header-y += xt_owner.h
		header-y += xt_pkttype.h
		header-y += xt_quota.h
		header-y += xt_rateest.h
		header-y += xt_realm.h
		header-y += xt_recent.h
		@@ -39,6 +45,8 @@ header-y += xt_statistic.h
		header-y += xt_string.h
		header-y += xt_tcpmss.h
		header-y += xt_tcpudp.h
		header-y += xt_time.h
		header-y += xt_u32.h

		unifdef-y += nf_conntrack_common.h
		unifdef-y += nf_conntrack_ftp.h

+1 −0

Original line number	Diff line number	Diff line
		@@ -76,6 +76,7 @@ extern int nfnetlink_subsys_unregister(const struct nfnetlink_subsystem *n);
		extern int nfnetlink_has_listeners(unsigned int group);
		extern int nfnetlink_send(struct sk_buff *skb, u32 pid, unsigned group,
		int echo);
		extern void nfnetlink_set_err(u32 pid, u32 group, int error);
		extern int nfnetlink_unicast(struct sk_buff *skb, u_int32_t pid, int flags);

		extern void nfnl_lock(void);

+8 −7

Original line number	Diff line number	Diff line
		@@ -349,23 +349,22 @@ struct xt_table
		{
		struct list_head list;

		/* A unique name... */
		const char name[XT_TABLE_MAXNAMELEN];

		/* What hooks you will enter on */
		unsigned int valid_hooks;

		/* Lock for the curtain */
		rwlock_t lock;
		struct mutex lock;

		/* Man behind the curtain... */
		//struct ip6t_table_info *private;
		void *private;
		struct xt_table_info *private;

		/* Set this to THIS_MODULE if you are a module, otherwise NULL */
		struct module *me;

		u_int8_t af; /* address/protocol family */

		/* A unique name... */
		const char name[XT_TABLE_MAXNAMELEN];
		};

		#include <linux/netfilter_ipv4.h>
		@@ -386,7 +385,7 @@ struct xt_table_info

		/* ipt_entry tables: one per CPU */
		/* Note : this field MUST be the last one, see XT_TABLE_INFO_SZ */
		char *entries[1];
		void *entries[1];
		};

		#define XT_TABLE_INFO_SZ (offsetof(struct xt_table_info, entries) \
		@@ -433,6 +432,8 @@ extern void xt_proto_fini(struct net *net, u_int8_t af);

		extern struct xt_table_info *xt_alloc_table_info(unsigned int size);
		extern void xt_free_table_info(struct xt_table_info *info);
		extern void xt_table_entry_swap_rcu(struct xt_table_info *old,
		struct xt_table_info *new);

		#ifdef CONFIG_COMPAT
		#include <net/compat.h>

0 → 100644

+13 −0

Original line number	Diff line number	Diff line
		#ifndef _XT_LED_H
		#define _XT_LED_H

		struct xt_led_info {
		char id[27]; /* Unique ID for this trigger in the LED class */
		__u8 always_blink; /* Blink even if the LED is already on */
		__u32 delay; /* Delay until LED is switched off after trigger */

		/* Kernel data used in the module */
		void *internal_data __attribute__((aligned(8)));
		};

		#endif /* _XT_LED_H */