Commit dd720783 authored Nov 19, 2024 by Paolo Abeni

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

Merge in late fixes to prepare for the 6.13 net-next PR.

Conflicts:

include/linux/phy.h
  41ffcd95 net: phy: fix phylib's dual eee_enabled
  721aa69e net: phy: convert eee_broken_modes to a linkmode bitmap
https://lore.kernel.org/all/20241118135512.1039208b@canb.auug.org.au/



drivers/net/ethernet/wangxun/txgbe/txgbe_phy.c
  2160428b net: txgbe: fix null pointer to pcs
  2160428b net: txgbe: remove GPIO interrupt controller

Adjacent commits:

include/linux/phy.h
  41ffcd95 net: phy: fix phylib's dual eee_enabled
  516a5f11 net: phy: respect cached advertising when re-enabling EEE

Signed-off-by: Paolo Abeni <pabeni@redhat.com>

parents 96ed62ea 66418447

MAINTAINERS

+3 −0

Original line number	Diff line number	Diff line
		@@ -16091,7 +16091,9 @@ F: include/uapi/linux/net_shaper.h
		F: include/uapi/linux/netdev*
		F: tools/testing/selftests/drivers/net/
		X: Documentation/devicetree/bindings/net/bluetooth/
		X: Documentation/devicetree/bindings/net/can/
		X: Documentation/devicetree/bindings/net/wireless/
		X: drivers/net/can/
		X: drivers/net/wireless/

		NETWORKING DRIVERS (WIRELESS)
		@@ -16180,6 +16182,7 @@ X: include/net/mac80211.h
		X: include/net/wext.h
		X: net/9p/
		X: net/bluetooth/
		X: net/can/
		X: net/mac80211/
		X: net/rfkill/
		X: net/wireless/

drivers/net/ethernet/google/gve/gve_adminq.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -1248,10 +1248,10 @@ gve_adminq_configure_flow_rule(struct gve_priv *priv,
		sizeof(struct gve_adminq_configure_flow_rule),
		flow_rule_cmd);

		if (err) {
		if (err == -ETIME) {
		dev_err(&priv->pdev->dev, "Timeout to configure the flow rule, trigger reset");
		gve_reset(priv, true);
		} else {
		} else if (!err) {
		priv->flow_rules_cache.rules_cache_synced = false;
		}

drivers/net/ethernet/intel/i40e/i40e_ethtool.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -5299,7 +5299,7 @@ static int i40e_set_priv_flags(struct net_device *dev, u32 flags)
		}

		flags_complete:
		bitmap_xor(changed_flags, pf->flags, orig_flags, I40E_PF_FLAGS_NBITS);
		bitmap_xor(changed_flags, new_flags, orig_flags, I40E_PF_FLAGS_NBITS);

		if (test_bit(I40E_FLAG_FW_LLDP_DIS, changed_flags))
		reset_needed = I40E_PF_RESET_AND_REBUILD_FLAG;

drivers/net/ethernet/meta/fbnic/fbnic_pci.c

+0 −2

Original line number	Diff line number	Diff line
		@@ -334,7 +334,6 @@ static int fbnic_probe(struct pci_dev pdev, const struct pci_device_id ent)
		free_irqs:
		fbnic_free_irqs(fbd);
		free_fbd:
		pci_disable_device(pdev);
		fbnic_devlink_free(fbd);

		return err;
		@@ -367,7 +366,6 @@ static void fbnic_remove(struct pci_dev *pdev)
		fbnic_fw_disable_mbx(fbd);
		fbnic_free_irqs(fbd);

		pci_disable_device(pdev);
		fbnic_devlink_free(fbd);
		}

drivers/net/ethernet/wangxun/txgbe/txgbe_phy.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -162,7 +162,7 @@ static struct phylink_pcs txgbe_phylink_mac_select(struct phylink_config confi
		struct wx *wx = phylink_to_wx(config);
		struct txgbe *txgbe = wx->priv;

		if (interface == PHY_INTERFACE_MODE_10GBASER)
		if (wx->media_type != sp_media_copper)
		return txgbe->pcs;

		return NULL;