Skip to content

Commit 8e60dbc

Browse files
Marcin Szycikanguy11
authored andcommitted
ice: Fix netif_is_ice() in Safe Mode
netif_is_ice() works by checking the pointer to netdev ops. However, it only checks for the default ice_netdev_ops, not ice_netdev_safe_mode_ops, so in Safe Mode it always returns false, which is unintuitive. While it doesn't look like netif_is_ice() is currently being called anywhere in Safe Mode, this could change and potentially lead to unexpected behaviour. Fixes: df006dd ("ice: Add initial support framework for LAG") Reviewed-by: Przemek Kitszel <[email protected]> Signed-off-by: Marcin Szycik <[email protected]> Reviewed-by: Brett Creeley <[email protected]> Tested-by: Sujai Buvaneswaran <[email protected]> Signed-off-by: Tony Nguyen <[email protected]>
1 parent b972060 commit 8e60dbc

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

drivers/net/ethernet/intel/ice/ice_main.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,8 @@ ice_indr_setup_tc_cb(struct net_device *netdev, struct Qdisc *sch,
8787

8888
bool netif_is_ice(const struct net_device *dev)
8989
{
90-
return dev && (dev->netdev_ops == &ice_netdev_ops);
90+
return dev && (dev->netdev_ops == &ice_netdev_ops ||
91+
dev->netdev_ops == &ice_netdev_safe_mode_ops);
9192
}
9293

9394
/**

0 commit comments

Comments
 (0)