Commit 7058b837 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 leak in nl80211 AP start where we leak the ACL memory, from
    Johannes Berg.

 2) Fix double mutex unlock in mac80211, from Andrei Otcheretianski.

 3) Fix RCU stall in ipset, from Jozsef Kadlecsik.

 4) Fix devlink locking in devlink_dpipe_table_register, from Madhuparna
    Bhowmik.

 5) Fix race causing TX hang in ll_temac, from Esben Haabendal.

 6) Stale eth hdr pointer in br_dev_xmit(), from Nikolay Aleksandrov.

 7) Fix TX hash calculation bounds checking wrt. tc rules, from Amritha
    Nambiar.

 8) Size netlink responses properly in schedule action code to take into
    consideration TCA_ACT_FLAGS. From Jiri Pirko.

 9) Fix firmware paths for mscc PHY driver, from Antoine Tenart.

10) Don't register stmmac notifier multiple times, from Aaro Koskinen.

11) Various rmnet bug fixes, from Taehee Yoo.

12) Fix vsock deadlock in vsock transport release, from Stefano
    Garzarella.

* git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net: (61 commits)
  net: dsa: mv88e6xxx: Fix masking of egress port
  mlxsw: pci: Wait longer before accessing the device after reset
  sfc: fix timestamp reconstruction at 16-bit rollover points
  vsock: fix potential deadlock in transport->release()
  unix: It's CONFIG_PROC_FS not CONFIG_PROCFS
  net: rmnet: fix packet forwarding in rmnet bridge mode
  net: rmnet: fix bridge mode bugs
  net: rmnet: use upper/lower device infrastructure
  net: rmnet: do not allow to change mux id if mux id is duplicated
  net: rmnet: remove rcu_read_lock in rmnet_force_unassociate_device()
  net: rmnet: fix suspicious RCU usage
  net: rmnet: fix NULL pointer dereference in rmnet_changelink()
  net: rmnet: fix NULL pointer dereference in rmnet_newlink()
  net: phy: marvell: don't interpret PHY status unless resolved
  mlx5: register lag notifier for init network namespace only
  unix: define and set show_fdinfo only if procfs is enabled
  hinic: fix a bug of rss configuration
  hinic: fix a bug of setting hw_ioctxt
  hinic: fix a irq affinity bug
  net/smc: check for valid ib_client_data
  ...
parents a2f0b878 3ee339eb

Documentation/networking/phy.rst

+3 −2
Original line number Diff line number Diff line
@@ -487,8 +487,9 @@ phy_register_fixup_for_id():: 
The stubs set one of the two matching criteria, and set the other one to

match anything.



When phy_register_fixup() or \*_for_uid()/\*_for_id() is called at module,

unregister fixup and free allocate memory are required.

When phy_register_fixup() or \*_for_uid()/\*_for_id() is called at module load

time, the module needs to unregister the fixup and free allocated memory when

it's unloaded.



Call one of following function before unloading module::

drivers/net/dsa/bcm_sf2.c

+1 −2
Original line number Diff line number Diff line
@@ -69,8 +69,7 @@ static void bcm_sf2_imp_setup(struct dsa_switch *ds, int port) 
		/* Force link status for IMP port */

		reg = core_readl(priv, offset);

		reg |= (MII_SW_OR | LINK_STS);

		if (priv->type == BCM7278_DEVICE_ID)

			reg |= GMII_SPEED_UP_2G;

		reg &= ~GMII_SPEED_UP_2G;

		core_writel(priv, reg, offset);



		/* Enable Broadcast, Multicast, Unicast forwarding to IMP port */

drivers/net/dsa/mv88e6xxx/global1.c

+2 −2
Original line number Diff line number Diff line
@@ -278,13 +278,13 @@ int mv88e6095_g1_set_egress_port(struct mv88e6xxx_chip *chip, 
	switch (direction) {

	case MV88E6XXX_EGRESS_DIR_INGRESS:

		dest_port_chip = &chip->ingress_dest_port;

		reg &= MV88E6185_G1_MONITOR_CTL_INGRESS_DEST_MASK;

		reg &= ~MV88E6185_G1_MONITOR_CTL_INGRESS_DEST_MASK;

		reg |= port <<

		       __bf_shf(MV88E6185_G1_MONITOR_CTL_INGRESS_DEST_MASK);

		break;

	case MV88E6XXX_EGRESS_DIR_EGRESS:

		dest_port_chip = &chip->egress_dest_port;

		reg &= MV88E6185_G1_MONITOR_CTL_EGRESS_DEST_MASK;

		reg &= ~MV88E6185_G1_MONITOR_CTL_EGRESS_DEST_MASK;

		reg |= port <<

		       __bf_shf(MV88E6185_G1_MONITOR_CTL_EGRESS_DEST_MASK);

		break;

drivers/net/ethernet/broadcom/bnxt/bnxt.c

+2 −2
Original line number Diff line number Diff line
@@ -11252,7 +11252,7 @@ static void bnxt_cfg_ntp_filters(struct bnxt *bp) 
		}

	}

	if (test_and_clear_bit(BNXT_HWRM_PF_UNLOAD_SP_EVENT, &bp->sp_event))

		netdev_info(bp->dev, "Receive PF driver unload event!");

		netdev_info(bp->dev, "Receive PF driver unload event!\n");

}



#else
@@ -11759,7 +11759,7 @@ static int bnxt_pcie_dsn_get(struct bnxt *bp, u8 dsn[]) 
	u32 dw;



	if (!pos) {

		netdev_info(bp->dev, "Unable do read adapter's DSN");

		netdev_info(bp->dev, "Unable do read adapter's DSN\n");

		return -EOPNOTSUPP;

	}

drivers/net/ethernet/broadcom/bnxt/bnxt_devlink.c

+5 −5
Original line number Diff line number Diff line
@@ -641,14 +641,14 @@ static int bnxt_dl_params_register(struct bnxt *bp) 
	rc = devlink_params_register(bp->dl, bnxt_dl_params,

				     ARRAY_SIZE(bnxt_dl_params));

	if (rc) {

		netdev_warn(bp->dev, "devlink_params_register failed. rc=%d",

		netdev_warn(bp->dev, "devlink_params_register failed. rc=%d\n",

			    rc);

		return rc;

	}

	rc = devlink_port_params_register(&bp->dl_port, bnxt_dl_port_params,

					  ARRAY_SIZE(bnxt_dl_port_params));

	if (rc) {

		netdev_err(bp->dev, "devlink_port_params_register failed");

		netdev_err(bp->dev, "devlink_port_params_register failed\n");

		devlink_params_unregister(bp->dl, bnxt_dl_params,

					  ARRAY_SIZE(bnxt_dl_params));

		return rc;
@@ -679,7 +679,7 @@ int bnxt_dl_register(struct bnxt *bp) 
	else

		dl = devlink_alloc(&bnxt_vf_dl_ops, sizeof(struct bnxt_dl));

	if (!dl) {

		netdev_warn(bp->dev, "devlink_alloc failed");

		netdev_warn(bp->dev, "devlink_alloc failed\n");

		return -ENOMEM;

	}
@@ -692,7 +692,7 @@ int bnxt_dl_register(struct bnxt *bp) 


	rc = devlink_register(dl, &bp->pdev->dev);

	if (rc) {

		netdev_warn(bp->dev, "devlink_register failed. rc=%d", rc);

		netdev_warn(bp->dev, "devlink_register failed. rc=%d\n", rc);

		goto err_dl_free;

	}
@@ -704,7 +704,7 @@ int bnxt_dl_register(struct bnxt *bp) 
			       sizeof(bp->dsn));

	rc = devlink_port_register(dl, &bp->dl_port, bp->pf.port_id);

	if (rc) {

		netdev_err(bp->dev, "devlink_port_register failed");

		netdev_err(bp->dev, "devlink_port_register failed\n");

		goto err_dl_unreg;

	}

CRA Git | Maintained and supported by SUSTech CRA and CCSE