diff options
| author |   David S. Miller <davem@davemloft.net> | 2021-06-17 12:11:28 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2021-06-17 12:11:28 -0700 |
| commit | 8fe088bd4fd12f4c8899b51d5bc3daad98767d49 (patch) | |
| tree | 295265672e6c2dd6b9d80673f7dbdff1d4339d83 /drivers/net/ethernet/intel/ice/ice_switch.h | |
| parent | Merge branch 'hdlc_ppp-cleanups' (diff) | |
| parent | ice: remove redundant continue statement in a for-loop (diff) | |
| download | wireguard-linux-8fe088bd4fd12f4c8899b51d5bc3daad98767d49.tar.xz wireguard-linux-8fe088bd4fd12f4c8899b51d5bc3daad98767d49.zip | |
Merge branch '100GbE' of git://git.kernel.org/pub/scm/linux/kernel/git/tnguy/next-queue
Tony Nguyen says:
====================
100GbE Intel Wired LAN Driver Updates 2021-06-17
This series contains updates to ice driver only.
Jake corrects a couple of entries in the PTYPE table to properly
reflect the datasheet and removes unneeded NULL checks for some
PTP calls.
Paul reduces the scope of variables and removes the use of a local
variable.
Shaokun Zhang removes a duplicate function declaration.
Lorenzo Bianconi fixes a compilation warning if PTP_1588_CLOCK is
disabled.
Colin Ian King changes a for loop to remove an unneeded 'continue'.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/intel/ice/ice_switch.h')
| -rw-r--r-- | drivers/net/ethernet/intel/ice/ice_switch.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/net/ethernet/intel/ice/ice_switch.h b/drivers/net/ethernet/intel/ice/ice_switch.h index 6bb7358ff67b..c5db8d56133f 100644 --- a/drivers/net/ethernet/intel/ice/ice_switch.h +++ b/drivers/net/ethernet/intel/ice/ice_switch.h @@ -247,7 +247,6 @@ ice_set_vlan_vsi_promisc(struct ice_hw *hw, u16 vsi_handle, u8 promisc_mask, enum ice_status ice_init_def_sw_recp(struct ice_hw *hw); u16 ice_get_hw_vsi_num(struct ice_hw *hw, u16 vsi_handle); -bool ice_is_vsi_valid(struct ice_hw *hw, u16 vsi_handle); enum ice_status ice_replay_vsi_all_fltr(struct ice_hw *hw, u16 vsi_handle); void ice_rm_all_sw_replay_rule_info(struct ice_hw *hw); |