diff options
| author | Anjali Singhai Jain | 2014-04-01 09:11:53 +0200 |
|---|---|---|
| committer | Jeff Kirsher | 2014-04-28 14:28:27 +0200 |
| commit | 2e86a0b6601bfafd8497a17d1dc25ceb300aa123 (patch) | |
| tree | bc32947ebec3312d456266a51612abefb86023b8 | |
| parent | i40e: Change variable type to avoid typecheck failure (diff) | |
| download | kernel-qcow2-linux-2e86a0b6601bfafd8497a17d1dc25ceb300aa123.tar.gz kernel-qcow2-linux-2e86a0b6601bfafd8497a17d1dc25ceb300aa123.tar.xz kernel-qcow2-linux-2e86a0b6601bfafd8497a17d1dc25ceb300aa123.zip | |
i40e: Do not enable NTUPLE feature control in MFP mode
Although NTUPLE feature control is disabled by default, do not
allow user to be able to change it.
Change-ID: I4c3f95fb6dbc56b1b6cc47116ea1f72de02bc99c
Signed-off-by: Anjali Singhai Jain <anjali.singhai@intel.com>
Signed-off-by: Catherine Sullivan <catherine.sullivan@intel.com>
Tested-by: Kavindya Deegala <kavindya.s.deegala@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
| -rw-r--r-- | drivers/net/ethernet/intel/i40e/i40e_main.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/net/ethernet/intel/i40e/i40e_main.c b/drivers/net/ethernet/intel/i40e/i40e_main.c index 126be0dcc23e..550656104600 100644 --- a/drivers/net/ethernet/intel/i40e/i40e_main.c +++ b/drivers/net/ethernet/intel/i40e/i40e_main.c @@ -6783,10 +6783,12 @@ static int i40e_config_netdev(struct i40e_vsi *vsi) NETIF_F_TSO_ECN | NETIF_F_TSO6 | NETIF_F_RXCSUM | - NETIF_F_NTUPLE | NETIF_F_RXHASH | 0; + if (!(pf->flags & I40E_FLAG_MFP_ENABLED)) + netdev->features |= NETIF_F_NTUPLE; + /* copy netdev features into list of user selectable features */ netdev->hw_features |= netdev->features; |