From 763be6deaaea2539016056c0dcbf6e967af506e2 Mon Sep 17 00:00:00 2001 From: Bjarne von Horn Date: Thu, 11 Apr 2024 10:46:30 +0200 Subject: [PATCH] missing igb get_ecdev conversions in 5.14, 5.15 and 6.1 --- devices/igb/igb_main-5.14-ethercat.c | 6 +++--- devices/igb/igb_main-5.15-ethercat.c | 6 +++--- devices/igb/igb_main-6.1-ethercat.c | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/devices/igb/igb_main-5.14-ethercat.c b/devices/igb/igb_main-5.14-ethercat.c index 3c6c20ac..5a12a120 100644 --- a/devices/igb/igb_main-5.14-ethercat.c +++ b/devices/igb/igb_main-5.14-ethercat.c @@ -5548,13 +5548,13 @@ static void igb_watchdog_task(struct work_struct *work) u32 connsw; u16 phy_data, retry_count = 20; - if (adapter->ecdev) + if (get_ecdev(adapter)) hw->mac.get_link_status = true; link = igb_has_link(adapter); - if (adapter->ecdev) { - ecdev_set_link(adapter->ecdev, link); + if (get_ecdev(adapter)) { + ecdev_set_link(get_ecdev(adapter), link); return; } diff --git a/devices/igb/igb_main-5.15-ethercat.c b/devices/igb/igb_main-5.15-ethercat.c index 58db950c..a849cc57 100644 --- a/devices/igb/igb_main-5.15-ethercat.c +++ b/devices/igb/igb_main-5.15-ethercat.c @@ -5538,13 +5538,13 @@ static void igb_watchdog_task(struct work_struct *work) u32 connsw; u16 phy_data, retry_count = 20; - if (adapter->ecdev) + if (get_ecdev(adapter)) hw->mac.get_link_status = true; link = igb_has_link(adapter); - if (adapter->ecdev) { - ecdev_set_link(adapter->ecdev, link); + if (get_ecdev(adapter)) { + ecdev_set_link(get_ecdev(adapter), link); return; } diff --git a/devices/igb/igb_main-6.1-ethercat.c b/devices/igb/igb_main-6.1-ethercat.c index a5dd91a6..c82c4977 100644 --- a/devices/igb/igb_main-6.1-ethercat.c +++ b/devices/igb/igb_main-6.1-ethercat.c @@ -5571,13 +5571,13 @@ static void igb_watchdog_task(struct work_struct *work) u32 connsw; u16 phy_data, retry_count = 20; - if (adapter->ecdev) + if (get_ecdev(adapter)) hw->mac.get_link_status = true; link = igb_has_link(adapter); - if (adapter->ecdev) { - ecdev_set_link(adapter->ecdev, link); + if (get_ecdev(adapter)) { + ecdev_set_link(get_ecdev(adapter), link); return; }