Page Menu
Home
FreeBSD
Search
Configure Global Search
Log In
Files
F177608506
D59578.1794831594.diff
No One
Temporary
Actions
View File
Edit File
Delete File
View Transforms
Subscribe
Flag For Later
Award Token
Authored By
Unknown
Size
1 KB
Referenced Files
None
Subscribers
None
D59578.1794831594.diff
View Options
diff --git a/sys/dev/ice/ice_lib.c b/sys/dev/ice/ice_lib.c
--- a/sys/dev/ice/ice_lib.c
+++ b/sys/dev/ice/ice_lib.c
@@ -9533,7 +9533,9 @@
if (!ice_test_state(&sc->state, ICE_STATE_LINK_ACTIVE_ON_DOWN)) {
ice_set_link(sc, false);
ice_set_state(&sc->state, ICE_STATE_LINK_STATUS_REPORTED);
- } else
+ } else if (!ice_test_state(&sc->state,
+ ICE_STATE_TOTAL_PORT_SHUTDOWN) ||
+ (if_getflags(sc->ifp) & IFF_UP) != 0)
ice_apply_saved_phy_cfg(sc, ICE_APPLY_LS_FEC_FC);
} else {
/* Set link down, and poll for media available in timer. This prevents the
diff --git a/sys/dev/ice/if_ice_iflib.c b/sys/dev/ice/if_ice_iflib.c
--- a/sys/dev/ice/if_ice_iflib.c
+++ b/sys/dev/ice/if_ice_iflib.c
@@ -3465,10 +3465,8 @@
} else {
ice_clear_state(&sc->state, ICE_STATE_PHY_FW_INIT_PENDING);
- if (ice_is_e830(hw)) {
- if (!(sc->ldo_tlv.options & ICE_LINK_OVERRIDE_PORT_DIS))
- return;
-
+ if (ice_is_e830(hw) &&
+ (sc->ldo_tlv.options & ICE_LINK_OVERRIDE_PORT_DIS) != 0) {
ice_set_state(&sc->state, ICE_STATE_TOTAL_PORT_SHUTDOWN);
ice_clear_state(&sc->state, ICE_STATE_LINK_ACTIVE_ON_DOWN);
}
File Metadata
Details
Attached
Mime Type
text/plain
Expires
Mon, Nov 16, 12:19 PM (2 h, 16 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
41777366
Default Alt Text
D59578.1794831594.diff (1 KB)
Attached To
Mode
D59578: ice(4): Fix link bringup on driver load
Attached
Detach File
Event Timeline