Commit 5f4fc6d4 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 AF_XDP cq entry leak, from Ilya Maximets.

 2) Fix handling of PHY power-down on RTL8411B, from Heiner Kallweit.

 3) Add some new PCI IDs to iwlwifi, from Ihab Zhaika.

 4) Fix handling of neigh timers wrt. entries added by userspace, from
    Lorenzo Bianconi.

 5) Various cases of missing of_node_put(), from Nishka Dasgupta.

 6) The new NET_ACT_CT needs to depend upon NF_NAT, from Yue Haibing.

 7) Various RDS layer fixes, from Gerd Rausch.

 8) Fix some more fallout from TCQ_F_CAN_BYPASS generalization, from
    Cong Wang.

 9) Fix FIB source validation checks over loopback, also from Cong Wang.

10) Use promisc for unsupported number of filters, from Justin Chen.

11) Missing sibling route unlink on failure in ipv6, from Ido Schimmel.

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (90 commits)
  tcp: fix tcp_set_congestion_control() use from bpf hook
  ag71xx: fix return value check in ag71xx_probe()
  ag71xx: fix error return code in ag71xx_probe()
  usb: qmi_wwan: add D-Link DWM-222 A2 device ID
  bnxt_en: Fix VNIC accounting when enabling aRFS on 57500 chips.
  net: dsa: sja1105: Fix missing unlock on error in sk_buff()
  gve: replace kfree with kvfree
  selftests/bpf: fix test_xdp_noinline on s390
  selftests/bpf: fix "valid read map access into a read-only array 1" on s390
  net/mlx5: Replace kfree with kvfree
  MAINTAINERS: update netsec driver
  ipv6: Unlink sibling route in case of failure
  liquidio: Replace vmalloc + memset with vzalloc
  udp: Fix typo in net/ipv4/udp.c
  net: bcmgenet: use promisc for unsupported filters
  ipv6: rt6_check should return NULL if 'from' is NULL
  tipc: initialize 'validated' field of received packets
  selftests: add a test case for rp_filter
  fib: relax source validation check for loopback packets
  mlxsw: spectrum: Do not process learned records with a dummy FID
  ...
parents 249be851 8d650cde

Documentation/networking/bonding.txt

+13 −3
Original line number Diff line number Diff line
@@ -707,8 +707,8 @@ num_unsol_na 
	failover event.  As soon as the link is up on the new slave

	(possibly immediately) a peer notification is sent on the

	bonding device and each VLAN sub-device. This is repeated at

	each link monitor interval (arp_interval or miimon, whichever

	is active) if the number is greater than 1.

	the rate specified by peer_notif_delay if the number is

	greater than 1.



	The valid range is 0 - 255; the default value is 1.  These options

	affect only the active-backup mode.  These options were added for
@@ -727,6 +727,16 @@ packets_per_slave 
	The valid range is 0 - 65535; the default value is 1. This option

	has effect only in balance-rr mode.



peer_notif_delay



        Specify the delay, in milliseconds, between each peer

        notification (gratuitous ARP and unsolicited IPv6 Neighbor

        Advertisement) when they are issued after a failover event.

        This delay should be a multiple of the link monitor interval

        (arp_interval or miimon, whichever is active). The default

        value is 0 which means to match the value of the link monitor

        interval.



primary



	A string (eth0, eth2, etc) specifying which slave is the

MAINTAINERS

+2 −1
Original line number Diff line number Diff line
@@ -3108,9 +3108,9 @@ S: Maintained 
F:	arch/riscv/net/



BPF JIT for S390

M:	Ilya Leoshkevich <iii@linux.ibm.com>

M:	Heiko Carstens <heiko.carstens@de.ibm.com>

M:	Vasily Gorbik <gor@linux.ibm.com>

M:	Christian Borntraeger <borntraeger@de.ibm.com>

L:	netdev@vger.kernel.org

L:	bpf@vger.kernel.org

S:	Maintained
@@ -14873,6 +14873,7 @@ F: Documentation/devicetree/bindings/net/socionext,uniphier-ave4.txt 


SOCIONEXT (SNI) NETSEC NETWORK DRIVER

M:	Jassi Brar <jaswinder.singh@linaro.org>

M:	Ilias Apalodimas <ilias.apalodimas@linaro.org>

L:	netdev@vger.kernel.org

S:	Maintained

F:	drivers/net/ethernet/socionext/netsec.c

drivers/atm/idt77252.c

+0 −1
Original line number Diff line number Diff line
@@ -1379,7 +1379,6 @@ init_tsq(struct idt77252_dev *card) 
		printk("%s: can't allocate TSQ.\n", card->name);

		return -1;

	}

	memset(card->tsq.base, 0, TSQSIZE);



	card->tsq.last = card->tsq.base + TSQ_NUM_ENTRIES - 1;

	card->tsq.next = card->tsq.last;

drivers/isdn/hardware/mISDN/hfcsusb.c

+3 −0
Original line number Diff line number Diff line
@@ -1955,6 +1955,9 @@ hfcsusb_probe(struct usb_interface *intf, const struct usb_device_id *id) 


				/* get endpoint base */

				idx = ((ep_addr & 0x7f) - 1) * 2;

				if (idx > 15)

					return -EIO;



				if (ep_addr & 0x80)

					idx++;

				attr = ep->desc.bmAttributes;

drivers/net/caif/caif_hsi.c

+1 −1
Original line number Diff line number Diff line
@@ -1455,7 +1455,7 @@ static void __exit cfhsi_exit_module(void) 
	rtnl_lock();

	list_for_each_safe(list_node, n, &cfhsi_list) {

		cfhsi = list_entry(list_node, struct cfhsi, list);

		unregister_netdev(cfhsi->ndev);

		unregister_netdevice(cfhsi->ndev);

	}

	rtnl_unlock();

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE