Commit 0033fced authored by David S. Miller's avatar David S. Miller
Browse files

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



Tony Nguyen says:

====================
Intel Wired LAN Driver Updates 2022-02-18

This series contains updates to ice driver only.

Wojciech fixes protocol matching for slow-path switchdev so that all
packets are correctly redirected.

Michal removes accidental unconditional setting of l4 port filtering
flag.

Jake adds locking to protect VF reset and removal to fix various issues
that can be encountered when they race with each other.

Tom Rix propagates an error and initializes a struct to resolve reported
Clang issues.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 90141edc 5950bdc8

drivers/net/ethernet/intel/ice/ice.h

+0 −1
Original line number Diff line number Diff line
@@ -280,7 +280,6 @@ enum ice_pf_state { 
	ICE_VFLR_EVENT_PENDING,

	ICE_FLTR_OVERFLOW_PROMISC,

	ICE_VF_DIS,

	ICE_VF_DEINIT_IN_PROGRESS,

	ICE_CFG_BUSY,

	ICE_SERVICE_SCHED,

	ICE_SERVICE_DIS,

drivers/net/ethernet/intel/ice/ice_common.c

+1 −1
Original line number Diff line number Diff line
@@ -3340,7 +3340,7 @@ ice_cfg_phy_fec(struct ice_port_info *pi, struct ice_aqc_set_phy_cfg_data *cfg, 


	if (fec == ICE_FEC_AUTO && ice_fw_supports_link_override(hw) &&

	    !ice_fw_supports_report_dflt_cfg(hw)) {

		struct ice_link_default_override_tlv tlv;

		struct ice_link_default_override_tlv tlv = { 0 };



		status = ice_get_link_default_override(&tlv, pi);

		if (status)

drivers/net/ethernet/intel/ice/ice_eswitch.c

+1 −0
Original line number Diff line number Diff line
@@ -44,6 +44,7 @@ ice_eswitch_add_vf_mac_rule(struct ice_pf *pf, struct ice_vf *vf, const u8 *mac) 
				       ctrl_vsi->rxq_map[vf->vf_id];

	rule_info.flags_info.act |= ICE_SINGLE_ACT_LB_ENABLE;

	rule_info.flags_info.act_valid = true;

	rule_info.tun_type = ICE_SW_TUN_AND_NON_TUN;



	err = ice_add_adv_rule(hw, list, lkups_cnt, &rule_info,

			       vf->repr->mac_rule);

drivers/net/ethernet/intel/ice/ice_main.c

+2 −0
Original line number Diff line number Diff line
@@ -1799,7 +1799,9 @@ static void ice_handle_mdd_event(struct ice_pf *pf) 
				 * reset, so print the event prior to reset.

				 */

				ice_print_vf_rx_mdd_event(vf);

				mutex_lock(&pf->vf[i].cfg_lock);

				ice_reset_vf(&pf->vf[i], false);

				mutex_unlock(&pf->vf[i].cfg_lock);

			}

		}

	}

drivers/net/ethernet/intel/ice/ice_protocol_type.h

+1 −0
Original line number Diff line number Diff line
@@ -47,6 +47,7 @@ enum ice_protocol_type { 


enum ice_sw_tunnel_type {

	ICE_NON_TUN = 0,

	ICE_SW_TUN_AND_NON_TUN,

	ICE_SW_TUN_VXLAN,

	ICE_SW_TUN_GENEVE,

	ICE_SW_TUN_NVGRE,