Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 88c1fe37 authored by qctecmdr Service's avatar qctecmdr Service Committed by Gerrit - the friendly Code Review server
Browse files

Merge "netfilter: nf_defrag_ipv4: Add sysctl to disable per interface"

parents f4264b7c acfb09ca

Documentation/networking/ip-sysctl.txt

+4 −0
Original line number Diff line number Diff line
@@ -1337,6 +1337,10 @@ igmp_link_local_mcast_reports - BOOLEAN 
	224.0.0.X range.

	Default TRUE



nf_ipv4_defrag_skip - BOOLEAN

	Skip defragmentation per interface if set.

	Default : 0 (always defrag)



Alexey Kuznetsov.

kuznet@ms2.inr.ac.ru

include/linux/inetdevice.h

+2 −0
Original line number Diff line number Diff line
@@ -131,6 +131,8 @@ static inline void ipv4_devconf_setall(struct in_device *in_dev) 
#define IN_DEV_ARP_ANNOUNCE(in_dev)	IN_DEV_MAXCONF((in_dev), ARP_ANNOUNCE)

#define IN_DEV_ARP_IGNORE(in_dev)	IN_DEV_MAXCONF((in_dev), ARP_IGNORE)

#define IN_DEV_ARP_NOTIFY(in_dev)	IN_DEV_MAXCONF((in_dev), ARP_NOTIFY)

#define IN_DEV_NF_IPV4_DEFRAG_SKIP(in_dev) \

	IN_DEV_ORCONF((in_dev), NF_IPV4_DEFRAG_SKIP)



struct in_ifaddr {

	struct hlist_node	hash;

include/uapi/linux/ip.h

+1 −0
Original line number Diff line number Diff line
@@ -169,6 +169,7 @@ enum 
	IPV4_DEVCONF_DROP_UNICAST_IN_L2_MULTICAST,

	IPV4_DEVCONF_DROP_GRATUITOUS_ARP,

	IPV4_DEVCONF_BC_FORWARDING,

	IPV4_DEVCONF_NF_IPV4_DEFRAG_SKIP,

	__IPV4_DEVCONF_MAX

};

include/uapi/linux/sysctl.h

+1 −0
Original line number Diff line number Diff line
@@ -483,6 +483,7 @@ enum 
	NET_IPV4_CONF_PROMOTE_SECONDARIES=20,

	NET_IPV4_CONF_ARP_ACCEPT=21,

	NET_IPV4_CONF_ARP_NOTIFY=22,

	NET_IPV4_CONF_NF_IPV4_DEFRAG_SKIP = 23,

};



/* /proc/sys/net/ipv4/netfilter */

kernel/sysctl_binary.c

+1 −0
Original line number Diff line number Diff line
@@ -257,6 +257,7 @@ static const struct bin_table bin_net_ipv4_conf_vars_table[] = { 
	{ CTL_INT,	NET_IPV4_CONF_NOPOLICY,			"disable_policy" },

	{ CTL_INT,	NET_IPV4_CONF_FORCE_IGMP_VERSION,	"force_igmp_version" },

	{ CTL_INT,	NET_IPV4_CONF_PROMOTE_SECONDARIES,	"promote_secondaries" },

	{ CTL_INT, NET_IPV4_CONF_NF_IPV4_DEFRAG_SKIP, "nf_ipv4_defrag_skip" },

	{}

};