Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net (6dbbd925) · Commits · e / devices / android_kernel_xiaomi_markw

Documentation/networking/ipvs-sysctl.txt

+55 −7

Original line number	Original line	Diff line number	Diff line
	@@ -15,6 +15,23 @@ amemthresh - INTEGER
	enabled and the variable is automatically set to 2, otherwise		enabled and the variable is automatically set to 2, otherwise
	the strategy is disabled and the variable is set to 1.		the strategy is disabled and the variable is set to 1.

			conntrack - BOOLEAN
			0 - disabled (default)
			not 0 - enabled

			If set, maintain connection tracking entries for
			connections handled by IPVS.

			This should be enabled if connections handled by IPVS are to be
			also handled by stateful firewall rules. That is, iptables rules
			that make use of connection tracking. It is a performance
			optimisation to disable this setting otherwise.

			Connections handled by the IPVS FTP application module
			will have connection tracking entries regardless of this setting.

			Only available when IPVS is compiled with CONFIG_IP_VS_NFCT enabled.

	cache_bypass - BOOLEAN		cache_bypass - BOOLEAN
	0 - disabled (default)		0 - disabled (default)
	not 0 - enabled		not 0 - enabled
	@@ -39,7 +56,7 @@ debug_level - INTEGER
	11 - IPVS packet handling (ip_vs_in/ip_vs_out)		11 - IPVS packet handling (ip_vs_in/ip_vs_out)
	12 or more - packet traversal		12 or more - packet traversal

	Only available when IPVS is compiled with the CONFIG_IPVS_DEBUG		Only available when IPVS is compiled with CONFIG_IP_VS_DEBUG enabled.

	Higher debugging levels include the messages for lower debugging		Higher debugging levels include the messages for lower debugging
	levels, so setting debug level 2, includes level 0, 1 and 2		levels, so setting debug level 2, includes level 0, 1 and 2
	@@ -123,13 +140,11 @@ nat_icmp_send - BOOLEAN
	secure_tcp - INTEGER		secure_tcp - INTEGER
	0 - disabled (default)		0 - disabled (default)

	The secure_tcp defense is to use a more complicated state		The secure_tcp defense is to use a more complicated TCP state
	transition table and some possible short timeouts of each		transition table. For VS/NAT, it also delays entering the
	state. In the VS/NAT, it delays the entering the ESTABLISHED		TCP ESTABLISHED state until the three way handshake is completed.
	until the real server starts to send data and ACK packet
	(after 3-way handshake).

	The value definition is the same as that of drop_entry or		The value definition is the same as that of drop_entry and
	drop_packet.		drop_packet.

	sync_threshold - INTEGER		sync_threshold - INTEGER
	@@ -141,3 +156,36 @@ sync_threshold - INTEGER
	synchronized, every time the number of its incoming packets		synchronized, every time the number of its incoming packets
	modulus 50 equals the threshold. The range of the threshold is		modulus 50 equals the threshold. The range of the threshold is
	from 0 to 49.		from 0 to 49.

			snat_reroute - BOOLEAN
			0 - disabled
			not 0 - enabled (default)

			If enabled, recalculate the route of SNATed packets from
			realservers so that they are routed as if they originate from the
			director. Otherwise they are routed as if they are forwarded by the
			director.

			If policy routing is in effect then it is possible that the route
			of a packet originating from a director is routed differently to a
			packet being forwarded by the director.

			If policy routing is not in effect then the recalculated route will
			always be the same as the original route so it is an optimisation
			to disable snat_reroute and avoid the recalculation.

			sync_version - INTEGER
			default 1

			The version of the synchronisation protocol used when sending
			synchronisation messages.

			0 selects the original synchronisation protocol (version 0). This
			should be used when sending synchronisation messages to a legacy
			system that only understands the original synchronisation protocol.

			1 selects the current synchronisation protocol (version 1). This
			should be used where possible.

			Kernels with this sync_version entry are able to receive messages
			of both version 1 and version 2 of the synchronisation protocol.

MAINTAINERS

+2 −3

Original line number	Original line	Diff line number	Diff line
	@@ -1716,6 +1716,7 @@ F: include/linux/can.h
	F: include/linux/can/core.h		F: include/linux/can/core.h
	F: include/linux/can/bcm.h		F: include/linux/can/bcm.h
	F: include/linux/can/raw.h		F: include/linux/can/raw.h
			F: include/linux/can/gw.h

	CAN NETWORK DRIVERS		CAN NETWORK DRIVERS
	M: Wolfgang Grandegger <wg@grandegger.com>		M: Wolfgang Grandegger <wg@grandegger.com>
	@@ -4476,11 +4477,9 @@ F: Documentation/networking/vxge.txt
	F: drivers/net/ethernet/neterion/		F: drivers/net/ethernet/neterion/

	NETFILTER/IPTABLES/IPCHAINS		NETFILTER/IPTABLES/IPCHAINS
	P: Rusty Russell
	P: Marc Boucher
	P: James Morris
	P: Harald Welte		P: Harald Welte
	P: Jozsef Kadlecsik		P: Jozsef Kadlecsik
			M: Pablo Neira Ayuso <pablo@netfilter.org>
	M: Patrick McHardy <kaber@trash.net>		M: Patrick McHardy <kaber@trash.net>
	L: netfilter-devel@vger.kernel.org		L: netfilter-devel@vger.kernel.org
	L: netfilter@vger.kernel.org		L: netfilter@vger.kernel.org

drivers/isdn/hisax/l3dss1.c

+3 −3

Original line number	Original line	Diff line number	Diff line
	@@ -353,7 +353,7 @@ l3dss1_parse_facility(struct PStack st, struct l3_process pc,
	{ l3dss1_dummy_invoke(st, cr, id, ident, p, nlen);		{ l3dss1_dummy_invoke(st, cr, id, ident, p, nlen);
	return;		return;
	}		}
	#ifdef HISAX_DE_AOC		#ifdef CONFIG_DE_AOC
	{		{

	#define FOO1(s,a,b) \		#define FOO1(s,a,b) \
	@@ -422,9 +422,9 @@ l3dss1_parse_facility(struct PStack st, struct l3_process pc,
	#undef FOO1		#undef FOO1

	}		}
	#else /* not HISAX_DE_AOC */		#else /* not CONFIG_DE_AOC */
	l3_debug(st, "invoke break");		l3_debug(st, "invoke break");
	#endif /* not HISAX_DE_AOC */		#endif /* not CONFIG_DE_AOC */
	break;		break;
	case 2: /* return result */		case 2: /* return result */
	/* if no process available handle separately */		/* if no process available handle separately */

drivers/net/bonding/bond_main.c

+12 −25

Original line number	Original line	Diff line number	Diff line
	@@ -550,7 +550,7 @@ down:
	/*		/*
	* Get link speed and duplex from the slave's base driver		* Get link speed and duplex from the slave's base driver
	* using ethtool. If for some reason the call fails or the		* using ethtool. If for some reason the call fails or the
	* values are invalid, fake speed and duplex to 100/Full		* values are invalid, set speed and duplex to -1,
	* and return error.		* and return error.
	*/		*/
	static int bond_update_speed_duplex(struct slave *slave)		static int bond_update_speed_duplex(struct slave *slave)
	@@ -560,9 +560,8 @@ static int bond_update_speed_duplex(struct slave *slave)
	u32 slave_speed;		u32 slave_speed;
	int res;		int res;

	/* Fake speed and duplex */		slave->speed = -1;
	slave->speed = SPEED_100;		slave->duplex = -1;
	slave->duplex = DUPLEX_FULL;

	res = __ethtool_get_settings(slave_dev, &ecmd);		res = __ethtool_get_settings(slave_dev, &ecmd);
	if (res < 0)		if (res < 0)
	@@ -1751,16 +1750,7 @@ int bond_enslave(struct net_device bond_dev, struct net_device slave_dev)
	new_slave->link = BOND_LINK_DOWN;		new_slave->link = BOND_LINK_DOWN;
	}		}

	if (bond_update_speed_duplex(new_slave) &&		bond_update_speed_duplex(new_slave);
	(new_slave->link != BOND_LINK_DOWN)) {
	pr_warning("%s: Warning: failed to get speed and duplex from %s, assumed to be 100Mb/sec and Full.\n",
	bond_dev->name, new_slave->dev->name);

	if (bond->params.mode == BOND_MODE_8023AD) {
	pr_warning("%s: Warning: Operation of 802.3ad mode requires ETHTOOL support in base driver for proper aggregator selection.\n",
	bond_dev->name);
	}
	}

	if (USES_PRIMARY(bond->params.mode) && bond->params.primary[0]) {		if (USES_PRIMARY(bond->params.mode) && bond->params.primary[0]) {
	/* if there is a primary slave, remember it */		/* if there is a primary slave, remember it */
	@@ -3220,6 +3210,7 @@ static int bond_slave_netdev_event(unsigned long event,
	{		{
	struct net_device *bond_dev = slave_dev->master;		struct net_device *bond_dev = slave_dev->master;
	struct bonding *bond = netdev_priv(bond_dev);		struct bonding *bond = netdev_priv(bond_dev);
			struct slave *slave = NULL;

	switch (event) {		switch (event) {
	case NETDEV_UNREGISTER:		case NETDEV_UNREGISTER:
	@@ -3230,10 +3221,8 @@ static int bond_slave_netdev_event(unsigned long event,
	bond_release(bond_dev, slave_dev);		bond_release(bond_dev, slave_dev);
	}		}
	break;		break;
			case NETDEV_UP:
	case NETDEV_CHANGE:		case NETDEV_CHANGE:
	if (bond->params.mode == BOND_MODE_8023AD \|\| bond_is_lb(bond)) {
	struct slave *slave;

	slave = bond_get_slave_by_dev(bond, slave_dev);		slave = bond_get_slave_by_dev(bond, slave_dev);
	if (slave) {		if (slave) {
	u32 old_speed = slave->speed;		u32 old_speed = slave->speed;
	@@ -3241,9 +3230,7 @@ static int bond_slave_netdev_event(unsigned long event,

	bond_update_speed_duplex(slave);		bond_update_speed_duplex(slave);

	if (bond_is_lb(bond))		if (bond->params.mode == BOND_MODE_8023AD) {
	break;

	if (old_speed != slave->speed)		if (old_speed != slave->speed)
	bond_3ad_adapter_speed_changed(slave);		bond_3ad_adapter_speed_changed(slave);
	if (old_duplex != slave->duplex)		if (old_duplex != slave->duplex)

drivers/net/bonding/bond_procfs.c

+10 −2

Original line number	Original line	Diff line number	Diff line
	@@ -157,8 +157,16 @@ static void bond_info_show_slave(struct seq_file *seq,
	seq_printf(seq, "\nSlave Interface: %s\n", slave->dev->name);		seq_printf(seq, "\nSlave Interface: %s\n", slave->dev->name);
	seq_printf(seq, "MII Status: %s\n",		seq_printf(seq, "MII Status: %s\n",
	(slave->link == BOND_LINK_UP) ? "up" : "down");		(slave->link == BOND_LINK_UP) ? "up" : "down");
			if (slave->speed == -1)
			seq_printf(seq, "Speed: %s\n", "Unknown");
			else
	seq_printf(seq, "Speed: %d Mbps\n", slave->speed);		seq_printf(seq, "Speed: %d Mbps\n", slave->speed);

			if (slave->duplex == -1)
			seq_printf(seq, "Duplex: %s\n", "Unknown");
			else
	seq_printf(seq, "Duplex: %s\n", slave->duplex ? "full" : "half");		seq_printf(seq, "Duplex: %s\n", slave->duplex ? "full" : "half");

	seq_printf(seq, "Link Failure Count: %u\n",		seq_printf(seq, "Link Failure Count: %u\n",
	slave->link_failure_count);		slave->link_failure_count);