]> www.infradead.org Git - users/dwmw2/linux.git/commitdiff
net: ionic: fix error check for vlan flags in ionic_set_nic_features()
authorJian Shen <shenjian15@huawei.com>
Fri, 29 Jul 2022 10:17:55 +0000 (18:17 +0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sun, 21 Aug 2022 13:15:51 +0000 (15:15 +0200)
[ Upstream commit a86e86db5e6d72c82724a63ca1c5293409a21518 ]

The prototype of input features of ionic_set_nic_features() is
netdev_features_t, but the vlan_flags is using the private
definition of ionic drivers. It should use the variable
ctx.cmd.lif_setattr.features, rather than features to check
the vlan flags. So fixes it.

Fixes: beead698b173 ("ionic: Add the basic NDO callbacks for netdev support")
Signed-off-by: Jian Shen <shenjian15@huawei.com>
Signed-off-by: Guangbin Huang <huangguangbin2@huawei.com>
Acked-by: Shannon Nelson <snelson@pensando.io>
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/net/ethernet/pensando/ionic/ionic_lif.c

index e95c09dc2c30d2911888410621897edc9ee8f93f..e42520f909fe23c6ae4734ed43e54b927482d72d 100644 (file)
@@ -1286,7 +1286,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");