git: e06918b94ac4 - main - ixgbe: update ixgbe_phy with ix-3.3.38 changes

[Kevin Bowling]

The branch main has been updated by kbowling:

URL: 
https://cgit.FreeBSD.org/src/commit/?id=e06918b94ac44448272a9d6747dcdba142e18b58

commit e06918b94ac44448272a9d6747dcdba142e18b58
Author:     Kevin Bowling <kbowl...@freebsd.org>
AuthorDate: 2024-09-21 09:45:12 +0000
Commit:     Kevin Bowling <kbowl...@freebsd.org>
CommitDate: 2024-09-21 09:45:12 +0000

    ixgbe: update ixgbe_phy with ix-3.3.38 changes
    
    MFC after:      1 week
---
 sys/dev/ixgbe/ixgbe_phy.c | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/sys/dev/ixgbe/ixgbe_phy.c b/sys/dev/ixgbe/ixgbe_phy.c
index c2f23179476b..e3f311473c38 100644
--- a/sys/dev/ixgbe/ixgbe_phy.c
+++ b/sys/dev/ixgbe/ixgbe_phy.c
@@ -1487,6 +1487,11 @@ s32 ixgbe_identify_sfp_module_generic(struct ixgbe_hw 
*hw)
                                hw->phy.type = ixgbe_phy_sfp_intel;
                                break;
                        default:
+                               if (cable_tech & IXGBE_SFF_DA_PASSIVE_CABLE)
+                                       hw->phy.type = 
ixgbe_phy_sfp_passive_unknown;
+                               else if (cable_tech & IXGBE_SFF_DA_ACTIVE_CABLE)
+                                       hw->phy.type = 
ixgbe_phy_sfp_active_unknown;
+                               else
                                hw->phy.type = ixgbe_phy_sfp_unknown;
                                break;
                        }
@@ -1495,10 +1500,6 @@ s32 ixgbe_identify_sfp_module_generic(struct ixgbe_hw 
*hw)
                /* Allow any DA cable vendor */
                if (cable_tech & (IXGBE_SFF_DA_PASSIVE_CABLE |
                        IXGBE_SFF_DA_ACTIVE_CABLE)) {
-                       if (cable_tech & IXGBE_SFF_DA_PASSIVE_CABLE)
-                               hw->phy.type = ixgbe_phy_sfp_passive_unknown;
-                       else if (cable_tech & IXGBE_SFF_DA_ACTIVE_CABLE)
-                               hw->phy.type = ixgbe_phy_sfp_active_unknown;
                        status = IXGBE_SUCCESS;
                        goto out;
                }