summaryrefslogtreecommitdiff
path: root/drivers/net/ethernet/intel/ice/ice_lag.c
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2025-07-21 17:53:33 +0300
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2025-07-21 17:53:33 +0300
commitbcbef1e4a626e093d4ead56593fb169eed5033c7 (patch)
treed17ab18b665433070a93c0cbd0d0291b0f262353 /drivers/net/ethernet/intel/ice/ice_lag.c
parent103f5d8c35b3d22b700f1f6d585e499b2df62df6 (diff)
parent89be9a83ccf1f88522317ce02f854f30d6115c41 (diff)
downloadlinux-bcbef1e4a626e093d4ead56593fb169eed5033c7.tar.xz
Merge tag 'v6.16-rc7' into tty-next
We need the tty/serial fixes in here as well. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/net/ethernet/intel/ice/ice_lag.c')
-rw-r--r--drivers/net/ethernet/intel/ice/ice_lag.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/ethernet/intel/ice/ice_lag.c b/drivers/net/ethernet/intel/ice/ice_lag.c
index 2410aee59fb2..d132eb477551 100644
--- a/drivers/net/ethernet/intel/ice/ice_lag.c
+++ b/drivers/net/ethernet/intel/ice/ice_lag.c
@@ -2226,7 +2226,8 @@ bool ice_lag_is_switchdev_running(struct ice_pf *pf)
struct ice_lag *lag = pf->lag;
struct net_device *tmp_nd;
- if (!ice_is_feature_supported(pf, ICE_F_SRIOV_LAG) || !lag)
+ if (!ice_is_feature_supported(pf, ICE_F_SRIOV_LAG) ||
+ !lag || !lag->upper_netdev)
return false;
rcu_read_lock();