diff options
| author | Jakub Kicinski <kuba@kernel.org> | 2022-08-01 12:09:37 -0700 |
|---|---|---|
| committer | Jakub Kicinski <kuba@kernel.org> | 2022-08-01 12:09:38 -0700 |
| commit | 1e02fd7671fe8ef64866e7753659c635192f5061 (patch) | |
| tree | 79d5ee128ba78a7473328afbd65c2b68fe8b1903 | |
| parent | 9fe2e6f3960687ab2a297fe09837a3f47cd2331f (diff) | |
| parent | a86e86db5e6d72c82724a63ca1c5293409a21518 (diff) | |
| download | linux-stable-1e02fd7671fe8ef64866e7753659c635192f5061.tar.gz linux-stable-1e02fd7671fe8ef64866e7753659c635192f5061.tar.bz2 linux-stable-1e02fd7671fe8ef64866e7753659c635192f5061.zip | |
Merge branch 'net-fix-using-wrong-flags-to-check-features'
Guangbin Huang says:
====================
net: fix using wrong flags to check features
We find that some drivers may use wrong flags to check features,
so fix them.
====================
Link: https://lore.kernel.org/r/20220729101755.4798-1-huangguangbin2@huawei.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
| -rw-r--r-- | drivers/net/ethernet/intel/ice/ice_main.c | 2 | ||||
| -rw-r--r-- | drivers/net/ethernet/pensando/ionic/ionic_lif.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/ethernet/intel/ice/ice_main.c b/drivers/net/ethernet/intel/ice/ice_main.c index 9f02b60459f1..bc68dc5c6927 100644 --- a/drivers/net/ethernet/intel/ice/ice_main.c +++ b/drivers/net/ethernet/intel/ice/ice_main.c @@ -433,7 +433,7 @@ static int ice_vsi_sync_fltr(struct ice_vsi *vsi) IFF_PROMISC; goto out_promisc; } - if (vsi->current_netdev_flags & + if (vsi->netdev->features & NETIF_F_HW_VLAN_CTAG_FILTER) vlan_ops->ena_rx_filtering(vsi); } diff --git a/drivers/net/ethernet/pensando/ionic/ionic_lif.c b/drivers/net/ethernet/pensando/ionic/ionic_lif.c index f3568901eb91..1443f788ee37 100644 --- a/drivers/net/ethernet/pensando/ionic/ionic_lif.c +++ b/drivers/net/ethernet/pensando/ionic/ionic_lif.c @@ -1437,7 +1437,7 @@ static int ionic_set_nic_features(struct ionic_lif *lif, if ((old_hw_features ^ lif->hw_features) & IONIC_ETH_HW_RX_HASH) ionic_lif_rss_config(lif, lif->rss_types, NULL, NULL); - if ((vlan_flags & features) && + if ((vlan_flags & le64_to_cpu(ctx.cmd.lif_setattr.features)) && !(vlan_flags & le64_to_cpu(ctx.comp.lif_setattr.features))) dev_info_once(lif->ionic->dev, "NIC is not supporting vlan offload, likely in SmartNIC mode\n"); |