Commit e216674a authored Mar 04, 2021 by David S. Miller

Merge branch '10GbE' of git://git.kernel.org/pub/scm/linux/kernel/git/tnguy/net-queue



Tony Nguyen says:

====================
Intel Wired LAN Driver Updates 2021-03-03

This series contains updates to ixgbe and ixgbevf drivers.

Bartosz Golaszewski does not error on -ENODEV from ixgbe_mii_bus_init()
as this is valid for some devices with a shared bus for ixgbe.

Antony Antony adds a check to fail for non transport mode SA with
offload as this is not supported for ixgbe and ixgbevf.

Dinghao Liu fixes a memory leak on failure to program a perfect filter
for ixgbe.
====================

Signed-off-by: David S. Miller <davem@davemloft.net>

parents a9ecb0cb 7a766381

drivers/net/ethernet/intel/ixgbe/ixgbe_ipsec.c

+5 −0

Original line number	Diff line number	Diff line
		@@ -575,6 +575,11 @@ static int ixgbe_ipsec_add_sa(struct xfrm_state *xs)
		return -EINVAL;
		}

		if (xs->props.mode != XFRM_MODE_TRANSPORT) {
		netdev_err(dev, "Unsupported mode for ipsec offload\n");
		return -EINVAL;
		}

		if (ixgbe_ipsec_check_mgmt_ip(xs)) {
		netdev_err(dev, "IPsec IP addr clash with mgmt filters\n");
		return -EINVAL;

drivers/net/ethernet/intel/ixgbe/ixgbe_main.c

+4 −2

Original line number	Diff line number	Diff line
		@@ -9565,7 +9565,9 @@ static int ixgbe_configure_clsu32(struct ixgbe_adapter *adapter,
		ixgbe_atr_compute_perfect_hash_82599(&input->filter, mask);
		err = ixgbe_fdir_write_perfect_filter_82599(hw, &input->filter,
		input->sw_idx, queue);
		if (!err)
		if (err)
		goto err_out_w_lock;

		ixgbe_update_ethtool_fdir_entry(adapter, input, input->sw_idx);
		spin_unlock(&adapter->fdir_perfect_lock);

drivers/net/ethernet/intel/ixgbevf/ipsec.c

+5 −0

Original line number	Diff line number	Diff line
		@@ -272,6 +272,11 @@ static int ixgbevf_ipsec_add_sa(struct xfrm_state *xs)
		return -EINVAL;
		}

		if (xs->props.mode != XFRM_MODE_TRANSPORT) {
		netdev_err(dev, "Unsupported mode for ipsec offload\n");
		return -EINVAL;
		}

		if (xs->xso.flags & XFRM_OFFLOAD_INBOUND) {
		struct rx_sa rsa;