Merge branch 'master' of git://1984.lsi.us.es/net-next (67da2552) · Commits · e / devices / android_kernel_xiaomi_markw

Documentation/feature-removal-schedule.txt

+7 −15

Original line number	Diff line number	Diff line
		@@ -414,21 +414,6 @@ Who: Jean Delvare <khali@linux-fr.org>

		----------------------------

		What: xt_connlimit rev 0
		When: 2012
		Who: Jan Engelhardt <jengelh@medozas.de>
		Files: net/netfilter/xt_connlimit.c

		----------------------------

		What: ipt_addrtype match include file
		When: 2012
		Why: superseded by xt_addrtype
		Who: Florian Westphal <fw@strlen.de>
		Files: include/linux/netfilter_ipv4/ipt_addrtype.h

		----------------------------

		What: i2c_driver.attach_adapter
		i2c_driver.detach_adapter
		When: September 2011
		@@ -589,6 +574,13 @@ Why: Remount currently allows changing bound subsystems and

		----------------------------

		What: xt_recent rev 0
		When: 2013
		Who: Pablo Neira Ayuso <pablo@netfilter.org>
		Files: net/netfilter/xt_recent.c

		----------------------------

		What: KVM debugfs statistics
		When: 2013
		Why: KVM tracepoints provide mostly equivalent information in a much more

+10 −0

Original line number	Diff line number	Diff line
		@@ -94,6 +94,16 @@ static inline int nf_inet_addr_cmp(const union nf_inet_addr *a1,
		a1->all[3] == a2->all[3];
		}

		static inline void nf_inet_addr_mask(const union nf_inet_addr *a1,
		union nf_inet_addr *result,
		const union nf_inet_addr *mask)
		{
		result->all[0] = a1->all[0] & mask->all[0];
		result->all[1] = a1->all[1] & mask->all[1];
		result->all[2] = a1->all[2] & mask->all[2];
		result->all[3] = a1->all[3] & mask->all[3];
		}

		extern void netfilter_init(void);

		/* Largest hook number + 1 */

+5 −0

Original line number	Diff line number	Diff line
		@@ -84,8 +84,13 @@ enum nfqnl_attr_config {
		NFQA_CFG_CMD, /* nfqnl_msg_config_cmd */
		NFQA_CFG_PARAMS, /* nfqnl_msg_config_params */
		NFQA_CFG_QUEUE_MAXLEN, /* __u32 */
		NFQA_CFG_MASK, /* identify which flags to change */
		NFQA_CFG_FLAGS, /* value of these flags (__u32) */
		__NFQA_CFG_MAX
		};
		#define NFQA_CFG_MAX (__NFQA_CFG_MAX-1)

		/* Flags for NFQA_CFG_FLAGS */
		#define NFQA_CFG_F_FAIL_OPEN (1 << 0)

		#endif /* _NFNETLINK_QUEUE_H */

+2 −7

Original line number	Diff line number	Diff line
		@@ -22,13 +22,8 @@ struct xt_connlimit_info {
		#endif
		};
		unsigned int limit;
		union {
		/* revision 0 */
		unsigned int inverse;

		/* revision 1 */
		__u32 flags;
		};

		/* Used internally by the kernel */
		struct xt_connlimit_data *data __attribute__((aligned(8)));

+10 −0

Original line number	Diff line number	Diff line
		@@ -32,4 +32,14 @@ struct xt_recent_mtinfo {
		__u8 side;
		};

		struct xt_recent_mtinfo_v1 {
		__u32 seconds;
		__u32 hit_count;
		__u8 check_set;
		__u8 invert;
		char name[XT_RECENT_NAME_LEN];
		__u8 side;
		union nf_inet_addr mask;
		};

		#endif /* _LINUX_NETFILTER_XT_RECENT_H */