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

Commit f0dc7f9c 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) Fix several bpfilter/UMH bugs, in particular make the UMH build not
    depend upon X86 specific Kconfig symbols. From Alexei Starovoitov.

 2) Fix handling of modified context pointer in bpf verifier, from
    Daniel Borkmann.

 3) Kill regression in ifdown/ifup sequences for hv_netvsc driver, from
    Dexuan Cui.

 4) When the bonding primary member name changes, we have to re-evaluate
    the bond->force_primary setting, from Xiangning Yu.

 5) Eliminate possible padding beyone end of SKB in cdc_ncm driver, from
    Bjørn Mork.

 6) RX queue length reported for UDP sockets in procfs and socket diag
    are inaccurate, from Paolo Abeni.

 7) Fix br_fdb_find_port() locking, from Petr Machata.

 8) Limit sk_rcvlowat values properly in TCP, from Soheil Hassas
    Yeganeh.

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (23 commits)
  tcp: limit sk_rcvlowat by the maximum receive buffer
  net: phy: dp83822: use BMCR_ANENABLE instead of BMSR_ANEGCAPABLE for DP83620
  socket: close race condition between sock_close() and sockfs_setattr()
  net: bridge: Fix locking in br_fdb_find_port()
  udp: fix rx queue len reported by diag and proc interface
  cdc_ncm: avoid padding beyond end of skb
  net/sched: act_simple: fix parsing of TCA_DEF_DATA
  net: fddi: fix a possible null-ptr-deref
  net: aquantia: fix unsigned numvecs comparison with less than zero
  net: stmmac: fix build failure due to missing COMMON_CLK dependency
  bpfilter: fix race in pipe access
  bpf, xdp: fix crash in xdp_umem_unaccount_pages
  xsk: Fix umem fill/completion queue mmap on 32-bit
  tools/bpf: fix selftest get_cgroup_id_user
  bpfilter: fix OUTPUT_FORMAT
  umh: fix race condition
  net: mscc: ocelot: Fix uninitialized error in ocelot_netdevice_event()
  bonding: re-evaluate force_primary when the primary slave name changes
  ip_tunnel: Fix name string concatenate in __ip_tunnel_create()
  hv_netvsc: Fix a network regression after ifdown/ifup
  ...
parents 1aaccb5f 867f816b

arch/um/drivers/vector_transports.c

+2 −1
Original line number Diff line number Diff line
@@ -120,7 +120,8 @@ static int raw_form_header(uint8_t *header, 
		skb,

		vheader,

		virtio_legacy_is_little_endian(),

		false

		false,

		0

	);



	return 0;

drivers/net/bonding/bond_options.c

+1 −0
Original line number Diff line number Diff line
@@ -1142,6 +1142,7 @@ static int bond_option_primary_set(struct bonding *bond, 
				   slave->dev->name);

			rcu_assign_pointer(bond->primary_slave, slave);

			strcpy(bond->params.primary, slave->dev->name);

			bond->force_primary = true;

			bond_select_active_slave(bond);

			goto out;

		}

drivers/net/ethernet/aquantia/atlantic/aq_pci_func.c

+5 −6
Original line number Diff line number Diff line
@@ -267,14 +267,13 @@ static int aq_pci_probe(struct pci_dev *pdev, 
	numvecs = min(numvecs, num_online_cpus());

	/*enable interrupts */

#if !AQ_CFG_FORCE_LEGACY_INT

	numvecs = pci_alloc_irq_vectors(self->pdev, 1, numvecs,

	err = pci_alloc_irq_vectors(self->pdev, 1, numvecs,

				    PCI_IRQ_MSIX | PCI_IRQ_MSI |

				    PCI_IRQ_LEGACY);



	if (numvecs < 0) {

		err = numvecs;

	if (err < 0)

		goto err_hwinit;

	}

	numvecs = err;

#endif

	self->irqvecs = numvecs;

drivers/net/ethernet/mscc/ocelot.c

+1 −1
Original line number Diff line number Diff line
@@ -1126,7 +1126,7 @@ static int ocelot_netdevice_event(struct notifier_block *unused, 
{

	struct netdev_notifier_changeupper_info *info = ptr;

	struct net_device *dev = netdev_notifier_info_to_dev(ptr);

	int ret;

	int ret = 0;



	if (netif_is_lag_master(dev)) {

		struct net_device *slave;

drivers/net/ethernet/stmicro/stmmac/Kconfig

+5 −5
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ config DWMAC_DWC_QOS_ETH 
	select PHYLIB

	select CRC32

	select MII

	depends on OF && HAS_DMA

	depends on OF && COMMON_CLK && HAS_DMA

	help

	  Support for chips using the snps,dwc-qos-ethernet.txt DT binding.
@@ -57,7 +57,7 @@ config DWMAC_ANARION 
config DWMAC_IPQ806X

	tristate "QCA IPQ806x DWMAC support"

	default ARCH_QCOM

	depends on OF && (ARCH_QCOM || COMPILE_TEST)

	depends on OF && COMMON_CLK && (ARCH_QCOM || COMPILE_TEST)

	select MFD_SYSCON

	help

	  Support for QCA IPQ806X DWMAC Ethernet.
@@ -100,7 +100,7 @@ config DWMAC_OXNAS 
config DWMAC_ROCKCHIP

	tristate "Rockchip dwmac support"

	default ARCH_ROCKCHIP

	depends on OF && (ARCH_ROCKCHIP || COMPILE_TEST)

	depends on OF && COMMON_CLK && (ARCH_ROCKCHIP || COMPILE_TEST)

	select MFD_SYSCON

	help

	  Support for Ethernet controller on Rockchip RK3288 SoC.
@@ -123,7 +123,7 @@ config DWMAC_SOCFPGA 
config DWMAC_STI

	tristate "STi GMAC support"

	default ARCH_STI

	depends on OF && (ARCH_STI || COMPILE_TEST)

	depends on OF && COMMON_CLK && (ARCH_STI || COMPILE_TEST)

	select MFD_SYSCON

	---help---

	  Support for ethernet controller on STi SOCs.
@@ -147,7 +147,7 @@ config DWMAC_STM32 
config DWMAC_SUNXI

	tristate "Allwinner GMAC support"

	default ARCH_SUNXI

	depends on OF && (ARCH_SUNXI || COMPILE_TEST)

	depends on OF && COMMON_CLK && (ARCH_SUNXI || COMPILE_TEST)

	---help---

	  Support for Allwinner A20/A31 GMAC ethernet controllers.