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

Commit 09cdc723 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge 5.4.5 into android-5.4 



Changes in 5.4.5
	inet: protect against too small mtu values.
	mqprio: Fix out-of-bounds access in mqprio_dump
	net: bridge: deny dev_set_mac_address() when unregistering
	net: dsa: fix flow dissection on Tx path
	net: ethernet: ti: cpsw: fix extra rx interrupt
	net: sched: fix dump qlen for sch_mq/sch_mqprio with NOLOCK subqueues
	net_sched: validate TCA_KIND attribute in tc_chain_tmplt_add()
	net: thunderx: start phy before starting autonegotiation
	net/tls: Fix return values to avoid ENOTSUPP
	openvswitch: support asymmetric conntrack
	tcp: md5: fix potential overestimation of TCP option space
	tipc: fix ordering of tipc module init and exit routine
	net/mlx5e: Query global pause state before setting prio2buffer
	net: ipv6: add net argument to ip6_dst_lookup_flow
	net: ipv6_stub: use ip6_dst_lookup_flow instead of ip6_dst_lookup
	tcp: fix rejected syncookies due to stale timestamps
	tcp: tighten acceptance of ACKs not matching a child socket
	tcp: Protect accesses to .ts_recent_stamp with {READ,WRITE}_ONCE()
	net: core: rename indirect block ingress cb function
	net: sched: allow indirect blocks to bind to clsact in TC
	cls_flower: Fix the behavior using port ranges with hw-offload
	gre: refetch erspan header from skb->data after pskb_may_pull()
	Fixed updating of ethertype in function skb_mpls_pop
	hsr: fix a NULL pointer dereference in hsr_dev_xmit()
	net: Fixed updating of ethertype in skb_mpls_push()
	net/mlx5e: Fix TXQ indices to be sequential
	act_ct: support asymmetric conntrack
	net/mlx5e: Fix SFF 8472 eeprom length
	net/mlx5e: Fix freeing flow with kfree() and not kvfree()
	net/mlx5e: Fix translation of link mode into speed
	net/mlx5e: ethtool, Fix analysis of speed setting
	page_pool: do not release pool until inflight == 0.
	xdp: obtain the mem_id mutex before trying to remove an entry.
	ionic: keep users rss hash across lif reset
	net: mscc: ocelot: unregister the PTP clock on deinit
	r8169: add missing RX enabling for WoL on RTL8125
	Linux 5.4.5

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
Change-Id: I65207949c27553e0bdc8d10740c9f11d97ff8ebf
parents b9962acc 9a088971

Makefile

+1 −1
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0

VERSION = 5

PATCHLEVEL = 4

SUBLEVEL = 4

SUBLEVEL = 5

EXTRAVERSION =

NAME = Kleptomaniac Octopus

drivers/infiniband/core/addr.c

+3 −4
Original line number Diff line number Diff line
@@ -421,16 +421,15 @@ static int addr6_resolve(struct sockaddr *src_sock, 
				(const struct sockaddr_in6 *)dst_sock;

	struct flowi6 fl6;

	struct dst_entry *dst;

	int ret;



	memset(&fl6, 0, sizeof fl6);

	fl6.daddr = dst_in->sin6_addr;

	fl6.saddr = src_in->sin6_addr;

	fl6.flowi6_oif = addr->bound_dev_if;



	ret = ipv6_stub->ipv6_dst_lookup(addr->net, NULL, &dst, &fl6);

	if (ret < 0)

		return ret;

	dst = ipv6_stub->ipv6_dst_lookup_flow(addr->net, NULL, &fl6, NULL);

	if (IS_ERR(dst))

		return PTR_ERR(dst);



	if (ipv6_addr_any(&src_in->sin6_addr))

		src_in->sin6_addr = fl6.saddr;

drivers/infiniband/sw/rxe/rxe_net.c

+5 −3
Original line number Diff line number Diff line
@@ -117,10 +117,12 @@ static struct dst_entry *rxe_find_route6(struct net_device *ndev, 
	memcpy(&fl6.daddr, daddr, sizeof(*daddr));

	fl6.flowi6_proto = IPPROTO_UDP;



	if (unlikely(ipv6_stub->ipv6_dst_lookup(sock_net(recv_sockets.sk6->sk),

						recv_sockets.sk6->sk, &ndst, &fl6))) {

	ndst = ipv6_stub->ipv6_dst_lookup_flow(sock_net(recv_sockets.sk6->sk),

					       recv_sockets.sk6->sk, &fl6,

					       NULL);

	if (unlikely(IS_ERR(ndst))) {

		pr_err_ratelimited("no route to %pI6\n", daddr);

		goto put;

		return NULL;

	}



	if (unlikely(ndst->error)) {

drivers/net/ethernet/cavium/thunder/thunder_bgx.c

+1 −1
Original line number Diff line number Diff line
@@ -1115,7 +1115,7 @@ static int bgx_lmac_enable(struct bgx *bgx, u8 lmacid) 
				       phy_interface_mode(lmac->lmac_type)))

			return -ENODEV;



		phy_start_aneg(lmac->phydev);

		phy_start(lmac->phydev);

		return 0;

	}

drivers/net/ethernet/mellanox/mlx5/core/en.h

+1 −1
Original line number Diff line number Diff line
@@ -816,7 +816,7 @@ struct mlx5e_xsk { 
struct mlx5e_priv {

	/* priv data path fields - start */

	struct mlx5e_txqsq *txq2sq[MLX5E_MAX_NUM_CHANNELS * MLX5E_MAX_NUM_TC];

	int channel_tc2txq[MLX5E_MAX_NUM_CHANNELS][MLX5E_MAX_NUM_TC];

	int channel_tc2realtxq[MLX5E_MAX_NUM_CHANNELS][MLX5E_MAX_NUM_TC];

#ifdef CONFIG_MLX5_CORE_EN_DCB

	struct mlx5e_dcbx_dp       dcbx_dp;

#endif