Commit f75b6f30 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 

Pull networking fixes from David Miller:

 1) Clear up some recent tipc regressions because of registration
    ordering. Fix from Junwei Hu.

 2) tipc's TLV_SET() can read past the end of the supplied buffer during
    the copy. From Chris Packham.

 3) ptp example program doesn't match the kernel, from Richard Cochran.

 4) Outgoing message type fix in qrtr, from Bjorn Andersson.

 5) Flow control regression in stmmac, from Tan Tee Min.

 6) Fix inband autonegotiation in phylink, from Russell King.

 7) Fix sk_bound_dev_if handling in rawv6_bind(), from Mike Manning.

 8) Fix usbnet crash after disconnect, from Kloetzke Jan.

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (21 commits)
  usbnet: fix kernel crash after disconnect
  selftests: fib_rule_tests: use pre-defined DEV_ADDR
  net-next: net: Fix typos in ip-sysctl.txt
  ipv6: Consider sk_bound_dev_if when binding a raw socket to an address
  net: phylink: ensure inband AN works correctly
  usbnet: ipheth: fix racing condition
  net: stmmac: dma channel control register need to be init first
  net: stmmac: fix ethtool flow control not able to get/set
  net: qrtr: Fix message type of outgoing packets
  networking: : fix typos in code comments
  ptp: Fix example program to match kernel.
  fddi: fix typos in code comments
  selftests: fib_rule_tests: enable forwarding before ipv4 from/iif test
  selftests: fib_rule_tests: fix local IPv4 address typo
  tipc: Avoid copying bytes beyond the supplied data
  2/2] net: xilinx_emaclite: use readx_poll_timeout() in mdio wait function
  1/2] net: axienet: use readx_poll_timeout() in mdio wait function
  vlan: Mark expected switch fall-through
  macvlan: Mark expected switch fall-through
  net/mlx4_en: ethtool, Remove unsupported SFP EEPROM high pages query
  ...
parents 86f9e56d ad70411a

Documentation/networking/ip-sysctl.txt

+2 −2
Original line number Diff line number Diff line
@@ -560,10 +560,10 @@ tcp_comp_sack_delay_ns - LONG INTEGER 
	Default : 1,000,000 ns (1 ms)



tcp_comp_sack_nr - INTEGER

	Max numer of SACK that can be compressed.

	Max number of SACK that can be compressed.

	Using 0 disables SACK compression.



	Detault : 44

	Default : 44



tcp_slow_start_after_idle - BOOLEAN

	If set, provide RFC2861 behavior and time out the congestion

Documentation/networking/segmentation-offloads.rst

+2 −2
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ The following technologies are described: 
 * Generic Segmentation Offload - GSO

 * Generic Receive Offload - GRO

 * Partial Generic Segmentation Offload - GSO_PARTIAL

 * SCTP accelleration with GSO - GSO_BY_FRAGS

 * SCTP acceleration with GSO - GSO_BY_FRAGS





TCP Segmentation Offload
@@ -148,7 +148,7 @@ that the IPv4 ID field is incremented in the case that a given header does 
not have the DF bit set.





SCTP accelleration with GSO

SCTP acceleration with GSO

===========================



SCTP - despite the lack of hardware support - can still take advantage of

drivers/net/ethernet/mellanox/mlx4/en_ethtool.c

+3 −1
Original line number Diff line number Diff line
@@ -2010,6 +2010,8 @@ static int mlx4_en_set_tunable(struct net_device *dev, 
	return ret;

}



#define MLX4_EEPROM_PAGE_LEN 256



static int mlx4_en_get_module_info(struct net_device *dev,

				   struct ethtool_modinfo *modinfo)

{
@@ -2044,7 +2046,7 @@ static int mlx4_en_get_module_info(struct net_device *dev, 
		break;

	case MLX4_MODULE_ID_SFP:

		modinfo->type = ETH_MODULE_SFF_8472;

		modinfo->eeprom_len = ETH_MODULE_SFF_8472_LEN;

		modinfo->eeprom_len = MLX4_EEPROM_PAGE_LEN;

		break;

	default:

		return -EINVAL;

drivers/net/ethernet/mellanox/mlx4/port.c

+0 −5
Original line number Diff line number Diff line
@@ -2077,11 +2077,6 @@ int mlx4_get_module_info(struct mlx4_dev *dev, u8 port, 
		size -= offset + size - I2C_PAGE_SIZE;



	i2c_addr = I2C_ADDR_LOW;

	if (offset >= I2C_PAGE_SIZE) {

		/* Reset offset to high page */

		i2c_addr = I2C_ADDR_HIGH;

		offset -= I2C_PAGE_SIZE;

	}



	cable_info = (struct mlx4_cable_info *)inmad->data;

	cable_info->dev_mem_address = cpu_to_be16(offset);

drivers/net/ethernet/stmicro/stmmac/stmmac_ethtool.c

+2 −2
Original line number Diff line number Diff line
@@ -460,7 +460,7 @@ stmmac_get_pauseparam(struct net_device *netdev, 
	} else {

		if (!linkmode_test_bit(ETHTOOL_LINK_MODE_Pause_BIT,

				       netdev->phydev->supported) ||

		    linkmode_test_bit(ETHTOOL_LINK_MODE_Asym_Pause_BIT,

		    !linkmode_test_bit(ETHTOOL_LINK_MODE_Asym_Pause_BIT,

				      netdev->phydev->supported))

			return;

	}
@@ -491,7 +491,7 @@ stmmac_set_pauseparam(struct net_device *netdev, 
	} else {

		if (!linkmode_test_bit(ETHTOOL_LINK_MODE_Pause_BIT,

				       phy->supported) ||

		    linkmode_test_bit(ETHTOOL_LINK_MODE_Asym_Pause_BIT,

		    !linkmode_test_bit(ETHTOOL_LINK_MODE_Asym_Pause_BIT,

				      phy->supported))

			return -EOPNOTSUPP;

	}

CRA Git | Maintained and supported by SUSTech CRA and CCSE