The branch main has been updated by kbowling (ports committer):

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

commit 0a4f0befab9d3a048232b00bea77bf3da20cfdd0
Author:     Xiaoyun Li <xiaoyun...@intel.com>
AuthorDate: 2018-09-17 09:28:12 +0000
Commit:     Kevin Bowling <kbowl...@freebsd.org>
CommitDate: 2021-09-07 04:17:13 +0000

    ixgbe: update X550 SFP identification
    
    Use ixgbe_identify_sfp_module_X550em to update SFP identification
    flow. ixgbe_identify_sfp_module_X550em includes specific checks for
    X550 about supported SFP modules.
    
    Signed-off-by: Xiaoyun Li <xiaoyun...@intel.com>
    Acked-by: Qi Zhang <qi.z.zh...@intel.com>
    
    Approved by:    imp
    Obtained from:  DPDK (175bedb0cc8f801be3050fa35b8d8d0971cea7cc)
    MFC after:      1 week
    Differential Revision:  https://reviews.freebsd.org/D31621
---
 sys/dev/ixgbe/ixgbe_x550.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sys/dev/ixgbe/ixgbe_x550.c b/sys/dev/ixgbe/ixgbe_x550.c
index df19c4c65201..1c79dda6c235 100644
--- a/sys/dev/ixgbe/ixgbe_x550.c
+++ b/sys/dev/ixgbe/ixgbe_x550.c
@@ -351,7 +351,7 @@ static s32 ixgbe_identify_phy_x550em(struct ixgbe_hw *hw)
 
        switch (hw->device_id) {
        case IXGBE_DEV_ID_X550EM_A_SFP:
-               return ixgbe_identify_module_generic(hw);
+               return ixgbe_identify_sfp_module_X550em(hw);
        case IXGBE_DEV_ID_X550EM_X_SFP:
                /* set up for CS4227 usage */
                ixgbe_setup_mux_ctl(hw);
@@ -359,7 +359,7 @@ static s32 ixgbe_identify_phy_x550em(struct ixgbe_hw *hw)
                /* Fallthrough */
 
        case IXGBE_DEV_ID_X550EM_A_SFP_N:
-               return ixgbe_identify_module_generic(hw);
+               return ixgbe_identify_sfp_module_X550em(hw);
                break;
        case IXGBE_DEV_ID_X550EM_X_KX4:
                hw->phy.type = ixgbe_phy_x550em_kx4;
_______________________________________________
dev-commits-src-main@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/dev-commits-src-main
To unsubscribe, send any mail to "dev-commits-src-main-unsubscr...@freebsd.org"

Reply via email to