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

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

Pull networking fixes from David Miller:

 1) Fix several scatter gather list issues in kTLS code, from Jakub
    Kicinski.

 2) macb driver device remove has to kill the hresp_err_tasklet. From
    Chuhong Yuan.

 3) Several memory leak and reference count bug fixes in tipc, from Tung
    Nguyen.

 4) Fix mlx5 build error w/o ipv6, from Yue Haibing.

 5) Fix jumbo frame and other regressions in r8169, from Heiner
    Kallweit.

 6) Undo some BUG_ON()'s and replace them with WARN_ON_ONCE and proper
    error propagation/handling. From Paolo Abeni.

* git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net: (24 commits)
  openvswitch: remove another BUG_ON()
  openvswitch: drop unneeded BUG_ON() in ovs_flow_cmd_build_info()
  net: phy: realtek: fix using paged operations with RTL8105e / RTL8208
  r8169: fix resume on cable plug-in
  r8169: fix jumbo configuration for RTL8168evl
  net: emulex: benet: indent a Kconfig depends continuation line
  selftests: forwarding: fix race between packet receive and tc check
  net: sched: fix `tc -s class show` no bstats on class with nolock subqueues
  net: ethernet: ti: ale: ensure vlan/mdb deleted when no members
  net/mlx5e: Fix build error without IPV6
  selftests: pmtu: use -oneline for ip route list cache
  tipc: fix duplicate SYN messages under link congestion
  tipc: fix wrong timeout input for tipc_wait_for_cond()
  tipc: fix wrong socket reference counter after tipc_sk_timeout() returns
  tipc: fix potential memory leak in __tipc_sendmsg()
  net: macb: add missed tasklet_kill
  selftests: bpf: correct perror strings
  selftests: bpf: test_sockmap: handle file creation failures gracefully
  net/tls: use sg_next() to walk sg entries
  net/tls: remove the dead inplace_crypto code
  ...
parents e5b3fc12 c5d72811

drivers/net/ethernet/cadence/macb_main.c

+1 −0
Original line number Diff line number Diff line
@@ -4422,6 +4422,7 @@ static int macb_remove(struct platform_device *pdev) 
		mdiobus_free(bp->mii_bus);



		unregister_netdev(dev);

		tasklet_kill(&bp->hresp_err_tasklet);

		pm_runtime_disable(&pdev->dev);

		pm_runtime_dont_use_autosuspend(&pdev->dev);

		if (!pm_runtime_suspended(&pdev->dev)) {

drivers/net/ethernet/mellanox/mlx5/core/en/tc_tun.c

+38 −36
Original line number Diff line number Diff line
@@ -130,42 +130,6 @@ static const char *mlx5e_netdev_kind(struct net_device *dev) 
		return "unknown";

}



static int mlx5e_route_lookup_ipv6(struct mlx5e_priv *priv,

				   struct net_device *mirred_dev,

				   struct net_device **out_dev,

				   struct net_device **route_dev,

				   struct flowi6 *fl6,

				   struct neighbour **out_n,

				   u8 *out_ttl)

{

	struct dst_entry *dst;

	struct neighbour *n;



	int ret;



	ret = ipv6_stub->ipv6_dst_lookup(dev_net(mirred_dev), NULL, &dst,

					 fl6);

	if (ret < 0)

		return ret;



	if (!(*out_ttl))

		*out_ttl = ip6_dst_hoplimit(dst);



	ret = get_route_and_out_devs(priv, dst->dev, route_dev, out_dev);

	if (ret < 0) {

		dst_release(dst);

		return ret;

	}



	n = dst_neigh_lookup(dst, &fl6->daddr);

	dst_release(dst);

	if (!n)

		return -ENOMEM;



	*out_n = n;

	return 0;

}



static int mlx5e_gen_ip_tunnel_header(char buf[], __u8 *ip_proto,

				      struct mlx5e_encap_entry *e)

{
@@ -319,6 +283,43 @@ release_neigh: 
	return err;

}



#if IS_ENABLED(CONFIG_INET) && IS_ENABLED(CONFIG_IPV6)

static int mlx5e_route_lookup_ipv6(struct mlx5e_priv *priv,

				   struct net_device *mirred_dev,

				   struct net_device **out_dev,

				   struct net_device **route_dev,

				   struct flowi6 *fl6,

				   struct neighbour **out_n,

				   u8 *out_ttl)

{

	struct dst_entry *dst;

	struct neighbour *n;



	int ret;



	ret = ipv6_stub->ipv6_dst_lookup(dev_net(mirred_dev), NULL, &dst,

					 fl6);

	if (ret < 0)

		return ret;



	if (!(*out_ttl))

		*out_ttl = ip6_dst_hoplimit(dst);



	ret = get_route_and_out_devs(priv, dst->dev, route_dev, out_dev);

	if (ret < 0) {

		dst_release(dst);

		return ret;

	}



	n = dst_neigh_lookup(dst, &fl6->daddr);

	dst_release(dst);

	if (!n)

		return -ENOMEM;



	*out_n = n;

	return 0;

}



int mlx5e_tc_tun_create_header_ipv6(struct mlx5e_priv *priv,

				    struct net_device *mirred_dev,

				    struct mlx5e_encap_entry *e)
@@ -436,6 +437,7 @@ release_neigh: 
	neigh_release(n);

	return err;

}

#endif



bool mlx5e_tc_tun_device_to_offload(struct mlx5e_priv *priv,

				    struct net_device *netdev)

drivers/net/ethernet/realtek/r8169_main.c

+2 −1
Original line number Diff line number Diff line
@@ -1542,6 +1542,7 @@ static void __rtl8169_set_wol(struct rtl8169_private *tp, u32 wolopts) 
	rtl_lock_config_regs(tp);



	device_set_wakeup_enable(tp_to_dev(tp), wolopts);

	tp->dev->wol_enabled = wolopts ? 1 : 0;

}



static int rtl8169_set_wol(struct net_device *dev, struct ethtool_wolinfo *wol)
@@ -3872,7 +3873,7 @@ static void rtl_hw_jumbo_enable(struct rtl8169_private *tp) 
	case RTL_GIGA_MAC_VER_27 ... RTL_GIGA_MAC_VER_28:

		r8168dp_hw_jumbo_enable(tp);

		break;

	case RTL_GIGA_MAC_VER_31 ... RTL_GIGA_MAC_VER_34:

	case RTL_GIGA_MAC_VER_31 ... RTL_GIGA_MAC_VER_33:

		r8168e_hw_jumbo_enable(tp);

		break;

	default:

drivers/net/ethernet/ti/cpsw_ale.c

+9 −3
Original line number Diff line number Diff line
@@ -384,7 +384,7 @@ int cpsw_ale_del_mcast(struct cpsw_ale *ale, const u8 *addr, int port_mask, 
		       int flags, u16 vid)

{

	u32 ale_entry[ALE_ENTRY_WORDS] = {0, 0, 0};

	int mcast_members;

	int mcast_members = 0;

	int idx;



	idx = cpsw_ale_match_addr(ale, addr, (flags & ALE_VLAN) ? vid : 0);
@@ -397,11 +397,13 @@ int cpsw_ale_del_mcast(struct cpsw_ale *ale, const u8 *addr, int port_mask, 
		mcast_members = cpsw_ale_get_port_mask(ale_entry,

						       ale->port_mask_bits);

		mcast_members &= ~port_mask;

	}



	if (mcast_members)

		cpsw_ale_set_port_mask(ale_entry, mcast_members,

				       ale->port_mask_bits);

	} else {

	else

		cpsw_ale_set_entry_type(ale_entry, ALE_TYPE_FREE);

	}



	cpsw_ale_write(ale, idx, ale_entry);

	return 0;
@@ -478,6 +480,10 @@ static void cpsw_ale_del_vlan_modify(struct cpsw_ale *ale, u32 *ale_entry, 
	members = cpsw_ale_get_vlan_member_list(ale_entry,

						ale->vlan_field_bits);

	members &= ~port_mask;

	if (!members) {

		cpsw_ale_set_entry_type(ale_entry, ALE_TYPE_FREE);

		return;

	}



	untag = cpsw_ale_get_vlan_untag_force(ale_entry,

					      ale->vlan_field_bits);

drivers/net/phy/realtek.c

+9 −0
Original line number Diff line number Diff line
@@ -439,6 +439,15 @@ static struct phy_driver realtek_drvs[] = { 
		.resume		= genphy_resume,

		.read_page	= rtl821x_read_page,

		.write_page	= rtl821x_write_page,

	}, {

		PHY_ID_MATCH_MODEL(0x001cc880),

		.name		= "RTL8208 Fast Ethernet",

		.read_mmd	= genphy_read_mmd_unsupported,

		.write_mmd	= genphy_write_mmd_unsupported,

		.suspend	= genphy_suspend,

		.resume		= genphy_resume,

		.read_page	= rtl821x_read_page,

		.write_page	= rtl821x_write_page,

	}, {

		PHY_ID_MATCH_EXACT(0x001cc910),

		.name		= "RTL8211 Gigabit Ethernet",

CRA Git | Maintained and supported by SUSTech CRA and CCSE