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

Commit e30cb13c 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:
 "Fixes keep trickling in:

  1) Various IP fragmentation memory limit hardening changes from Eric
     Dumazet.

  2) Revert ipv6 metrics leak change, it causes more problems than it
     fixes for now.

  3) Fix WoL regression in stmmac driver, from Jose Abreu.

  4) Netlink socket spectre v1 gadget fix, from Jeremy Cline"

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net:
  Revert "net/ipv6: fix metrics leak"
  rxrpc: Fix user call ID check in rxrpc_service_prealloc_one
  net: dsa: Do not suspend/resume closed slave_dev
  netlink: Fix spectre v1 gadget in netlink_create()
  Documentation: dpaa2: Use correct heading adornment
  net: stmmac: Fix WoL for PCI-based setups
  bonding: avoid lockdep confusion in bond_get_stats()
  enic: do not call enic_change_mtu in enic_probe
  ipv4: frags: handle possible skb truesize change
  inet: frag: enforce memory limits earlier
  net/mlx5e: IPoIB, Set the netdevice sw mtu in ipoib enhanced flow
  net/mlx5e: Fix null pointer access when setting MTU of vport representor
  net/mlx5e: Set port trust mode to PCP as default
  net/mlx5e: E-Switch, Initialize eswitch only if eswitch manager
  net: dsa: mv88e6xxx: Fix SERDES support on 88E6141/6341
  brcmfmac: fix regression in parsing NVRAM for multiple devices
  iwlwifi: add more card IDs for 9000 series
parents a3f94cb9 e6aed040

Documentation/networking/dpaa2/overview.rst

+1 −0
Original line number Diff line number Diff line 
.. include:: <isonum.txt>



=========================================================

DPAA2 (Data Path Acceleration Architecture Gen2) Overview

=========================================================

drivers/net/bonding/bond_main.c

+12 −2
Original line number Diff line number Diff line
@@ -1717,6 +1717,8 @@ int bond_enslave(struct net_device *bond_dev, struct net_device *slave_dev, 
		goto err_upper_unlink;

	}



	bond->nest_level = dev_get_nest_level(bond_dev) + 1;



	/* If the mode uses primary, then the following is handled by

	 * bond_change_active_slave().

	 */
@@ -1764,7 +1766,6 @@ int bond_enslave(struct net_device *bond_dev, struct net_device *slave_dev, 
	if (bond_mode_can_use_xmit_hash(bond))

		bond_update_slave_arr(bond, NULL);



	bond->nest_level = dev_get_nest_level(bond_dev);



	netdev_info(bond_dev, "Enslaving %s as %s interface with %s link\n",

		    slave_dev->name,
@@ -3415,6 +3416,13 @@ static void bond_fold_stats(struct rtnl_link_stats64 *_res, 
	}

}



static int bond_get_nest_level(struct net_device *bond_dev)

{

	struct bonding *bond = netdev_priv(bond_dev);



	return bond->nest_level;

}



static void bond_get_stats(struct net_device *bond_dev,

			   struct rtnl_link_stats64 *stats)

{
@@ -3423,7 +3431,7 @@ static void bond_get_stats(struct net_device *bond_dev, 
	struct list_head *iter;

	struct slave *slave;



	spin_lock(&bond->stats_lock);

	spin_lock_nested(&bond->stats_lock, bond_get_nest_level(bond_dev));

	memcpy(stats, &bond->bond_stats, sizeof(*stats));



	rcu_read_lock();
@@ -4227,6 +4235,7 @@ static const struct net_device_ops bond_netdev_ops = { 
	.ndo_neigh_setup	= bond_neigh_setup,

	.ndo_vlan_rx_add_vid	= bond_vlan_rx_add_vid,

	.ndo_vlan_rx_kill_vid	= bond_vlan_rx_kill_vid,

	.ndo_get_lock_subclass  = bond_get_nest_level,

#ifdef CONFIG_NET_POLL_CONTROLLER

	.ndo_netpoll_setup	= bond_netpoll_setup,

	.ndo_netpoll_cleanup	= bond_netpoll_cleanup,
@@ -4725,6 +4734,7 @@ static int bond_init(struct net_device *bond_dev) 
	if (!bond->wq)

		return -ENOMEM;



	bond->nest_level = SINGLE_DEPTH_NESTING;

	netdev_lockdep_set_classes(bond_dev);



	list_add_tail(&bond->bond_list, &bn->dev_list);

drivers/net/dsa/mv88e6xxx/chip.c

+2 −2
Original line number Diff line number Diff line
@@ -2617,7 +2617,6 @@ static const struct mv88e6xxx_ops mv88e6085_ops = { 
	.rmu_disable = mv88e6085_g1_rmu_disable,

	.vtu_getnext = mv88e6352_g1_vtu_getnext,

	.vtu_loadpurge = mv88e6352_g1_vtu_loadpurge,

	.serdes_power = mv88e6341_serdes_power,

};



static const struct mv88e6xxx_ops mv88e6095_ops = {
@@ -2783,6 +2782,7 @@ static const struct mv88e6xxx_ops mv88e6141_ops = { 
	.reset = mv88e6352_g1_reset,

	.vtu_getnext = mv88e6352_g1_vtu_getnext,

	.vtu_loadpurge = mv88e6352_g1_vtu_loadpurge,

	.serdes_power = mv88e6341_serdes_power,

	.gpio_ops = &mv88e6352_gpio_ops,

};
@@ -2960,7 +2960,6 @@ static const struct mv88e6xxx_ops mv88e6175_ops = { 
	.reset = mv88e6352_g1_reset,

	.vtu_getnext = mv88e6352_g1_vtu_getnext,

	.vtu_loadpurge = mv88e6352_g1_vtu_loadpurge,

	.serdes_power = mv88e6341_serdes_power,

};



static const struct mv88e6xxx_ops mv88e6176_ops = {
@@ -3336,6 +3335,7 @@ static const struct mv88e6xxx_ops mv88e6341_ops = { 
	.reset = mv88e6352_g1_reset,

	.vtu_getnext = mv88e6352_g1_vtu_getnext,

	.vtu_loadpurge = mv88e6352_g1_vtu_loadpurge,

	.serdes_power = mv88e6341_serdes_power,

	.gpio_ops = &mv88e6352_gpio_ops,

	.avb_ops = &mv88e6390_avb_ops,

};

drivers/net/ethernet/cisco/enic/enic_main.c

+1 −1
Original line number Diff line number Diff line
@@ -2892,7 +2892,6 @@ static int enic_probe(struct pci_dev *pdev, const struct pci_device_id *ent) 
	 */



	enic->port_mtu = enic->config.mtu;

	(void)enic_change_mtu(netdev, enic->port_mtu);



	err = enic_set_mac_addr(netdev, enic->mac_addr);

	if (err) {
@@ -2982,6 +2981,7 @@ static int enic_probe(struct pci_dev *pdev, const struct pci_device_id *ent) 
	/* MTU range: 68 - 9000 */

	netdev->min_mtu = ENIC_MIN_MTU;

	netdev->max_mtu = ENIC_MAX_MTU;

	netdev->mtu	= enic->port_mtu;



	err = register_netdev(netdev);

	if (err) {

drivers/net/ethernet/mellanox/mlx5/core/en_dcbnl.c

+2 −0
Original line number Diff line number Diff line
@@ -1172,6 +1172,8 @@ static int mlx5e_trust_initialize(struct mlx5e_priv *priv) 
	struct mlx5_core_dev *mdev = priv->mdev;

	int err;



	priv->dcbx_dp.trust_state = MLX5_QPTS_TRUST_PCP;



	if (!MLX5_DSCP_SUPPORTED(mdev))

		return 0;