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

Commit 2a3a028f 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) Handle init flow failures properly in iwlwifi driver, from Shahar S
    Matityahu.

 2) mac80211 TXQs need to be unscheduled on powersave start, from Felix
    Fietkau.

 3) SKB memory accounting fix in A-MDSU aggregation, from Felix Fietkau.

 4) Increase RCU lock hold time in mlx5 FPGA code, from Saeed Mahameed.

 5) Avoid checksum complete with XDP in mlx5, also from Saeed.

 6) Fix netdev feature clobbering in ibmvnic driver, from Thomas Falcon.

 7) Partial sent TLS record leak fix from Jakub Kicinski.

 8) Reject zero size iova range in vhost, from Jason Wang.

 9) Allow pending work to complete before clcsock release from Karsten
    Graul.

10) Fix XDP handling max MTU in thunderx, from Matteo Croce.

11) A lot of protocols look at the sa_family field of a sockaddr before
    validating it's length is large enough, from Tetsuo Handa.

12) Don't write to free'd pointer in qede ptp error path, from Colin Ian
    King.

13) Have to recompile IP options in ipv4_link_failure because it can be
    invoked from ARP, from Stephen Suryaputra.

14) Doorbell handling fixes in qed from Denis Bolotin.

15) Revert net-sysfs kobject register leak fix, it causes new problems.
    From Wang Hai.

16) Spectre v1 fix in ATM code, from Gustavo A. R. Silva.

17) Fix put of BROPT_VLAN_STATS_PER_PORT in bridging code, from Nikolay
    Aleksandrov.

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (111 commits)
  socket: fix compat SO_RCVTIMEO_NEW/SO_SNDTIMEO_NEW
  tcp: tcp_grow_window() needs to respect tcp_space()
  ocelot: Clean up stats update deferred work
  ocelot: Don't sleep in atomic context (irqs_disabled())
  net: bridge: fix netlink export of vlan_stats_per_port option
  qed: fix spelling mistake "faspath" -> "fastpath"
  tipc: set sysctl_tipc_rmem and named_timeout right range
  tipc: fix link established but not in session
  net: Fix missing meta data in skb with vlan packet
  net: atm: Fix potential Spectre v1 vulnerabilities
  net/core: work around section mismatch warning for ptp_classifier
  net: bridge: fix per-port af_packet sockets
  bnx2x: fix spelling mistake "dicline" -> "decline"
  route: Avoid crash from dereferencing NULL rt->from
  MAINTAINERS: normalize Woojung Huh's email address
  bonding: fix event handling for stacked bonds
  Revert "net-sysfs: Fix memory leak in netdev_register_kobject"
  rtnetlink: fix rtnl_valid_stats_req() nlmsg_len check
  qed: Fix the DORQ's attentions handling
  qed: Fix missing DORQ attentions
  ...
parents 444fe991 e6986423

Documentation/networking/rxrpc.txt

+9 −7
Original line number Diff line number Diff line
@@ -1009,16 +1009,18 @@ The kernel interface functions are as follows: 


 (*) Check call still alive.



	u32 rxrpc_kernel_check_life(struct socket *sock,

				    struct rxrpc_call *call);

	bool rxrpc_kernel_check_life(struct socket *sock,

				     struct rxrpc_call *call,

				     u32 *_life);

	void rxrpc_kernel_probe_life(struct socket *sock,

				     struct rxrpc_call *call);



     The first function returns a number that is updated when ACKs are received

     from the peer (notably including PING RESPONSE ACKs which we can elicit by

     sending PING ACKs to see if the call still exists on the server).  The

     caller should compare the numbers of two calls to see if the call is still

     alive after waiting for a suitable interval.

     The first function passes back in *_life a number that is updated when

     ACKs are received from the peer (notably including PING RESPONSE ACKs

     which we can elicit by sending PING ACKs to see if the call still exists

     on the server).  The caller should compare the numbers of two calls to see

     if the call is still alive after waiting for a suitable interval.  It also

     returns true as long as the call hasn't yet reached the completed state.



     This allows the caller to work out if the server is still contactable and

     if the call is still alive on the server while waiting for the server to

MAINTAINERS

+1 −1
Original line number Diff line number Diff line
@@ -10145,7 +10145,7 @@ F: drivers/spi/spi-at91-usart.c 
F:	Documentation/devicetree/bindings/mfd/atmel-usart.txt



MICROCHIP KSZ SERIES ETHERNET SWITCH DRIVER

M:	Woojung Huh <Woojung.Huh@microchip.com>

M:	Woojung Huh <woojung.huh@microchip.com>

M:	Microchip Linux Driver Support <UNGLinuxDriver@microchip.com>

L:	netdev@vger.kernel.org

S:	Maintained

drivers/isdn/mISDN/socket.c

+2 −2
Original line number Diff line number Diff line
@@ -710,10 +710,10 @@ base_sock_bind(struct socket *sock, struct sockaddr *addr, int addr_len) 
	struct sock *sk = sock->sk;

	int err = 0;



	if (!maddr || maddr->family != AF_ISDN)

	if (addr_len < sizeof(struct sockaddr_mISDN))

		return -EINVAL;



	if (addr_len < sizeof(struct sockaddr_mISDN))

	if (!maddr || maddr->family != AF_ISDN)

		return -EINVAL;



	lock_sock(sk);

drivers/net/bonding/bond_main.c

+5 −1
Original line number Diff line number Diff line
@@ -3213,8 +3213,12 @@ static int bond_netdev_event(struct notifier_block *this, 
		return NOTIFY_DONE;



	if (event_dev->flags & IFF_MASTER) {

		int ret;



		netdev_dbg(event_dev, "IFF_MASTER\n");

		return bond_master_netdev_event(event, event_dev);

		ret = bond_master_netdev_event(event, event_dev);

		if (ret != NOTIFY_DONE)

			return ret;

	}



	if (event_dev->flags & IFF_SLAVE) {

drivers/net/ethernet/broadcom/bnx2x/bnx2x_vfpf.c

+1 −1
Original line number Diff line number Diff line
@@ -957,7 +957,7 @@ int bnx2x_vfpf_update_vlan(struct bnx2x *bp, u16 vid, u8 vf_qid, bool add) 
	bnx2x_sample_bulletin(bp);



	if (bp->shadow_bulletin.content.valid_bitmap & 1 << VLAN_VALID) {

		BNX2X_ERR("Hypervisor will dicline the request, avoiding\n");

		BNX2X_ERR("Hypervisor will decline the request, avoiding\n");

		rc = -EINVAL;

		goto out;

	}