diff options
| author |   Jacob Keller <jacob.e.keller@intel.com> | 2017-02-06 14:39:12 -0800 |
|---|---|---|
| committer |   Jeff Kirsher <jeffrey.t.kirsher@intel.com> | 2017-03-20 16:45:22 -0700 |
| commit | 1ec8deac8c63505194e773b9657824ed3c2fbdd8 (patch) | |
| tree | 98bddc5c8d6d7d3fffbdd2194265b96d5efccfe8 /drivers/net/ethernet/intel/i40e/i40e_ethtool.c | |
| parent | i40e: add counters for UDP/IPv4 and IPv4 filters (diff) | |
| download | linux-dev-1ec8deac8c63505194e773b9657824ed3c2fbdd8.tar.xz linux-dev-1ec8deac8c63505194e773b9657824ed3c2fbdd8.zip | |
i40e: explicitly fail on extended MAC field for ethtool_rx_flow_spec
Although we will fail the filter later due to checking flow_type which
will have a bogus invalid type, it is possible future refactoring will
remove this hidden failure case. Avoid a possible issue in the future by
explicitly checking the flow type at the start.
Change-Id: Ia98eb26f7b93ccbe38c7141e8f203ef496fc6598
Signed-off-by: Jacob Keller <jacob.e.keller@intel.com>
Tested-by: Andrew Bowers <andrewx.bowers@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Diffstat (limited to '')
| -rw-r--r-- | drivers/net/ethernet/intel/i40e/i40e_ethtool.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/net/ethernet/intel/i40e/i40e_ethtool.c b/drivers/net/ethernet/intel/i40e/i40e_ethtool.c index d16a5a6b24fc..905d66e87247 100644 --- a/drivers/net/ethernet/intel/i40e/i40e_ethtool.c +++ b/drivers/net/ethernet/intel/i40e/i40e_ethtool.c @@ -2771,6 +2771,10 @@ static int i40e_add_fdir_ethtool(struct i40e_vsi *vsi, fsp = (struct ethtool_rx_flow_spec *)&cmd->fs; + /* Extended MAC field is not supported */ + if (fsp->flow_type & FLOW_MAC_EXT) + return -EINVAL; + if (fsp->location >= (pf->hw.func_caps.fd_filters_best_effort + pf->hw.func_caps.fd_filters_guaranteed)) { return -EINVAL; |