| commit | 41a651288ab82dc9ff4e3df5ac565acf778a5169 | [log] [tgz] |
|---|---|---|
| author | Ziwei Xiao <ziweixiao@google.com> | Wed Dec 13 14:51:04 2023 -0800 |
| committer | COS Cherry Picker <cloud-image-release@prod.google.com> | Fri Jan 05 15:44:48 2024 -0800 |
| tree | e6a3214f47ffaf3ca8daad16354238fcc069ee6e | |
| parent | 7c454d0e28df2dd1b8611b2299411d25dc8fe47f [diff] |
gve: Remain netif_carrier_ok for gve_turndown The gve_turndown should only be called when the interface administrative state is up. So, netif_running is always true. The intent here is to clear the carrier if it's on. cos-patch: bug Change-Id: I190b4e018e87ecdfb604536d08369d9be74ebe8c Reviewed-on: https://cos-review.googlesource.com/c/third_party/kernel/+/62361 Tested-by: Ziwei Xiao <ziweixiao@google.com> Reviewed-by: Shailend Chand <shailend@google.com> (cherry picked from commit 8cc9187b58b2a23491e48135dd12e526b48ea2a1) Reviewed-on: https://cos-review.googlesource.com/c/third_party/kernel/+/62738 Reviewed-by: Oleksandr Tymoshenko <ovt@google.com> Tested-by: Cusky Presubmit Bot <presubmit@cos-infra-prod.iam.gserviceaccount.com> Main-Branch-Verified: Cusky Presubmit Bot <presubmit@cos-infra-prod.iam.gserviceaccount.com>
diff --git a/drivers/net/ethernet/google/gve/gve_main.c b/drivers/net/ethernet/google/gve/gve_main.c index 9ff1e97..025bf76 100644 --- a/drivers/net/ethernet/google/gve/gve_main.c +++ b/drivers/net/ethernet/google/gve/gve_main.c
@@ -1285,7 +1285,7 @@ static void gve_turndown(struct gve_priv *priv) { int idx; - if (netif_running(priv->dev)) + if (netif_carrier_ok(priv->dev)) netif_carrier_off(priv->dev); if (!gve_get_napi_enabled(priv))