@@ -1,4 +1,27 @@

 -------------------------------------------------------------------

+Wed Mar 13 12:12:43 UTC 2024 - Dr. Werner Fink <werner@suse.de>

+

+- Update to new version r8168-8.052.01

+- Remove patches now upstream

+  * skb_gso_segment.patch

+  * r8168-support-linux-6.1.0.patch

+- Port patches

+  * r8168-configuration.patch

+  * r8168-kernel_version.patch

+  * r8168-support-dev0x8136.patch

+  * r8168-support-linux-5.19.patch

+  * r8168-support-linux-L15.5.patch

+- Add r8168.keyring and signature of tar ball to check tar ball

+- Add patch r8168-gcc14.patch

+  * Avoid gcc14 trouble

+  * Switch from deprecated strlcpy() to strscpy()

+

+-------------------------------------------------------------------

+Wed Mar 13 11:26:04 UTC 2024 - Dr. Werner Fink <werner@suse.de>

+

+- Use %patch -P N instead of deprecated %patchN. 

+

+-------------------------------------------------------------------

 Thu Oct 19 08:29:04 UTC 2023 - Dr. Werner Fink <werner@suse.de>

 - Dynamic adaption of patch skb_gso_segment.patch means if net/gso.h

​

@@ -18,7 +18,7 @@

 #!BuildIgnore: enough-build-resources

 Name:           r8168

-Version:        8.051.02

+Version:        8.052.01

 Release:        0

 Summary:        Device driver for RealTek Gigabit Ethernet controllers

 License:        GPL-2.0-or-later

@@ -27,13 +27,14 @@

 Source0:        https://github.com/mtorromeo/r8168/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz

 Source1:        preamble

 Source2:        Module.supported

+Source3:        https://github.com/mtorromeo/r8168/releases/download/%{version}/%{name}-%{version}.tar.gz.asc

+Source4:        r8168.keyring

 Patch0:         r8168-kernel_version.patch

 Patch1:         r8168-configuration.patch

 Patch2:         r8168-support-linux-5.19.patch

-Patch3:         r8168-support-linux-6.1.0.patch

+Patch3:         r8168-gcc14.patch

 Patch4:         r8168-support-dev0x8136.patch

 Patch5:         r8168-support-linux-L15.5.patch

-Patch6:         skb_gso_segment.patch

 BuildRequires:  kernel-source

 BuildRequires:  kernel-syms

 BuildRequires:  libelf-devel

@@ -61,25 +62,24 @@

 %prep

 %setup -q

-%patch0 -b .p0

-%patch1 -b .p1

-%patch2 -p1 -b .p2

-%patch3 -p1 -b .p3

-%patch4 -p1 -b .p4

+%patch -P 0 -b .p0

+%patch -P 1 -b .p1

+%patch -P 2 -p1 -b .p2

+%patch -P 3 -b .p3

+%patch -P 4 -p1 -b .p4

 if test -e /usr/src/linux/include/linux/ethtool.h

 then

     argc=$(sed -rn '/\*get_ringparam/,/;$/p' /usr/src/linux/include/linux/ethtool.h | wc -l)

     if test -n "$argc" -a "$argc" -eq 4

     then

-%patch5 -b .p5

+%patch -P 5 -b .p5

     fi

 fi

 if test -e /usr/src/linux/include/net/gso.h

 then

     version=$(uname -r|sed -r 's/-.*//;s/\./,/g')

-    sed -ri "/KERNEL_VERSION/{s/\(6,4,10\)/(${version})/}" %{PATCH6}

+    sed -ri "/KERNEL_VERSION/{s/\(6,4,10\)/(${version})/}" src/r8168_n.c

 fi

-%patch6 -p1 -b .p6

 cp %{S:1} .

 cp %{S:2} .

​

@@ -4,7 +4,7 @@

 --- src/Makefile

 +++ src/Makefile   2022-05-10 10:26:59.851240712 +0000

-@@ -48,6 +48,7 @@ CONFIG_CTAP_SHORT_OFF = n

+@@ -52,6 +52,7 @@ CONFIG_CTAP_SHORT_OFF = n

  ifneq ($(KERNELRELEASE),)

    obj-m := r8168.o

    r8168-objs := r8168_n.o r8168_asf.o rtl_eeprom.o rtltool.o

​

@@ -0,0 +1,25 @@

+---

+ src/r8168_n.c |    5 +++--

+ 1 file changed, 3 insertions(+), 2 deletions(-)

+

+--- src/r8168_n.c

++++ src/r8168_n.c  2024-03-13 12:25:52.886342182 +0000

+@@ -6312,7 +6312,7 @@ rtl8168_get_drvinfo(struct net_device *d

+         info->eedump_len = tp->eeprom_len;

+         BUILD_BUG_ON(sizeof(info->fw_version) < sizeof(rtl_fw->version));

+         if (rtl_fw)

+-                strlcpy(info->fw_version, rtl_fw->version,

++                strscpy(info->fw_version, rtl_fw->version,

+                         sizeof(info->fw_version));

+ }

+ 

+@@ -28103,7 +28103,8 @@ rtl8168_link_timer(struct timer_list *t)

+ }

+ */

+ 

+-int rtl8168_enable_msix(struct rtl8168_private *tp)

++static int

++rtl8168_enable_msix(struct rtl8168_private *tp)

+ {

+         int i, nvecs = 0;

+         struct msix_entry msix_entR8168_MAX_MSIX_VEC;

​

@@ -4,8 +4,8 @@

  2 files changed, 18 insertions(+), 1 deletion(-)

 --- src/r8168.h

-+++ src/r8168.h    2022-05-10 10:26:28.831787721 +0000

-@@ -121,6 +121,10 @@ do { \

++++ src/r8168.h    2024-03-13 11:51:59.011947503 +0000

+@@ -133,6 +133,10 @@ do { \

  } while (0)

  #endif //LINUX_VERSION_CODE < KERNEL_VERSION(2,6,15)

@@ -17,7 +17,7 @@

  #if defined(skb_vlan_tag_present) && !defined(vlan_tx_tag_present)

  #define vlan_tx_tag_present skb_vlan_tag_present

 --- src/r8168_n.c

-+++ src/r8168_n.c  2022-05-10 10:26:28.871787016 +0000

++++ src/r8168_n.c  2024-03-13 11:57:02.890342590 +0000

 @@ -61,11 +61,16 @@

  #include <linux/rtnetlink.h>

  #include <linux/completion.h>

@@ -35,7 +35,7 @@

  #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,37)

  #include <linux/prefetch.h>

  #endif

-@@ -571,8 +576,12 @@ static void rtl8168_set_rx_mode(struct n

+@@ -590,8 +595,12 @@ static void rtl8168_set_rx_mode(struct n

  #if LINUX_VERSION_CODE >= KERNEL_VERSION(5,6,0)

  static void rtl8168_tx_timeout(struct net_device *dev, unsigned int txqueue);

  #else

@@ -46,9 +46,9 @@

  #endif

 +#endif

  static struct net_device_stats *rtl8168_get_stats(struct net_device *dev);

- static int rtl8168_rx_interrupt(struct net_device *, struct rtl8168_private *, napi_budget);

- static int rtl8168_change_mtu(struct net_device *dev, int new_mtu);

-@@ -28985,8 +28994,12 @@ static void

+ static int rtl8168_rx_interrupt(struct net_device *, struct rtl8168_private *, struct rtl8168_rx_ring *, napi_budget);

+ #ifdef CONFIG_R8168_NAPI

+@@ -30765,8 +30774,12 @@ static void

  rtl8168_tx_timeout(struct net_device *dev, unsigned int txqueue)

  #else

  static void

@@ -60,13 +60,13 @@

 +#endif

  {

          struct rtl8168_private *tp = netdev_priv(dev);

-         unsigned long flags;

-@@ -29672,7 +29685,7 @@ process_pkt:

-                         if (rtl8168_rx_vlan_skb(tp, desc, skb) < 0)

-                                 rtl8168_rx_skb(tp, skb);

+@@ -31502,7 +31515,7 @@ rtl8168_rx_interrupt(struct net_device *

+ 

+                 if (rtl8168_rx_vlan_skb(tp, desc, skb) < 0)

+                         rtl8168_rx_skb(tp, skb, ring_index);

 -#if LINUX_VERSION_CODE < KERNEL_VERSION(4,11,0)

 +#if LINUX_VERSION_CODE < KERNEL_VERSION(4,4,0)

-                         dev->last_rx = jiffies;

+                 dev->last_rx = jiffies;

  #endif //LINUX_VERSION_CODE < KERNEL_VERSION(4,11,0)

-                         RTLDEV->stats.rx_bytes += pkt_size;

+                 RTLDEV->stats.rx_bytes += pkt_size;

​

@@ -12,7 +12,7 @@

 index 28d7636..cbf43d1 100755

 --- a/src/r8168_n.c

 +++ b/src/r8168_n.c

-@@ -411,6 +411,7 @@ static const struct {

+@@ -430,6 +430,7 @@ static const struct {

  static struct pci_device_id rtl8168_pci_tbl = {

          { PCI_DEVICE(PCI_VENDOR_ID_REALTEK, 0x8168), },

​

@@ -1,6 +1,6 @@

 --- r8168-8.050.03/src/r8168_n.c

 +++ r8168-8.050.03/src/r8168_n.c

-@@ -121,6 +121,15 @@

+@@ -126,6 +126,15 @@

  #define FIRMWARE_8168FP_3   "rtl_nic/rtl8168fp-3.fw"

  #define FIRMWARE_8168FP_4   "rtl_nic/rtl8168fp-4.fw"

​

@@ -1,25 +0,0 @@

-From 39dd0fd2e5dc45cd63113f33a9890e36c304916d Mon Sep 17 00:00:00 2001

-From: zu1k <i@zu1k.com>

-Date: Sat, 29 Oct 2022 21:57:39 +0800

-Subject: PATCH Adapted for Linux 6.1

-

----

- src/r8168.h | 4 ++++

- 1 file changed, 4 insertions(+)

-

-diff --git a/src/r8168.h b/src/r8168.h

-index 662974a..baf48c6 100755

---- a/src/r8168.h

-+++ b/src/r8168.h

-@@ -570,7 +570,11 @@ typedef int *napi_budget;

- typedef struct napi_struct *napi_ptr;

- typedef int napi_budget;

- 

-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 1, 0)

-+#define RTL_NAPI_CONFIG(ndev, priv, function, weight)   netif_napi_add(ndev, &priv->napi, function)

-+#else

- #define RTL_NAPI_CONFIG(ndev, priv, function, weight)   netif_napi_add(ndev, &priv->napi, function, weight)

-+#endif

- #define RTL_NAPI_QUOTA(budget, ndev)            min(budget, budget)

- #define RTL_GET_PRIV(stuct_ptr, priv_struct)        container_of(stuct_ptr, priv_struct, stuct_ptr)

- #define RTL_GET_NETDEV(priv_ptr)            struct net_device *dev = priv_ptr->dev;

​

@@ -3,8 +3,8 @@

  1 file changed, 6 insertions(+), 6 deletions(-)

 --- src/r8168_n.c

-+++ src/r8168_n.c  2023-05-10 10:40:25.454736974 +0000

-@@ -5964,7 +5964,7 @@ rtl8168_wait_for_quiescence(struct net_d

++++ src/r8168_n.c  2024-03-13 12:10:07.947820999 +0000

+@@ -6986,7 +6986,7 @@ rtl8168_set_ring_size(struct rtl8168_pri

  }

  #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)

@@ -13,7 +13,7 @@

  static void rtl8168_get_ringparam(struct net_device *dev,

                                    struct ethtool_ringparam *ring,

                                    struct kernel_ethtool_ringparam *kernel_ring,

-@@ -5972,7 +5972,7 @@ static void rtl8168_get_ringparam(struct

+@@ -6994,7 +6994,7 @@ static void rtl8168_get_ringparam(struct

  #else

  static void rtl8168_get_ringparam(struct net_device *dev,

                                    struct ethtool_ringparam *ring)

@@ -22,8 +22,8 @@

  {

          struct rtl8168_private *tp = netdev_priv(dev);

-@@ -5982,7 +5982,7 @@ static void rtl8168_get_ringparam(struct

-         ring->tx_pending = tp->num_tx_desc;

+@@ -7004,7 +7004,7 @@ static void rtl8168_get_ringparam(struct

+         ring->tx_pending = tp->tx_ring0.num_tx_desc;

  }

 -#if LINUX_VERSION_CODE >= KERNEL_VERSION(5,17,0)

@@ -31,7 +31,7 @@

  static int rtl8168_set_ringparam(struct net_device *dev,

                                   struct ethtool_ringparam *ring,

                                   struct kernel_ethtool_ringparam *kernel_ring,

-@@ -5990,7 +5990,7 @@ static int rtl8168_set_ringparam(struct

+@@ -7012,7 +7012,7 @@ static int rtl8168_set_ringparam(struct

  #else

  static int rtl8168_set_ringparam(struct net_device *dev,

                                   struct ethtool_ringparam *ring)

@@ -40,7 +40,7 @@

  {

          struct rtl8168_private *tp = netdev_priv(dev);

          u32 new_rx_count, new_tx_count;

-@@ -25420,11 +25420,11 @@ rtl8168_release_board(struct pci_dev *pd

+@@ -26644,11 +26644,11 @@ rtl8168_release_board(struct pci_dev *pd

  static void

  rtl8168_hw_address_set(struct net_device *dev, u8 mac_addrMAC_ADDR_LEN)

  {

​

@@ -1,25 +0,0 @@

-From fc2e0d28c79d3f6ef052d85a7cb146610554ff22 Mon Sep 17 00:00:00 2001

-From: safocl <safocl88@gmail.com>

-Date: Sun, 13 Aug 2023 04:23:03 +0400

-Subject: PATCH Fix missing skb_gso_segment function declaration This

- motivation from this issue(https://github.com/mtorromeo/r8168/issues/54)

-

----

- src/r8168_n.c | 4 ++++

- 1 file changed, 4 insertions(+)

-

-diff --git a/src/r8168_n.c b/src/r8168_n.c

-index 7e9e2ea..3855910 100755

---- a/src/r8168_n.c

-+++ b/src/r8168_n.c

-@@ -86,6 +86,10 @@

- #include <linux/mdio.h>

- #endif

- 

-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(6,4,10)

-+#include <net/gso.h>

-+#endif

-+

- #include <asm/io.h>

- #include <asm/irq.h>

- 

​

@@ -0,0 +1,7 @@

+-----BEGIN PGP SIGNATURE-----

+

+iHUEABYIAB0WIQQMrarPcPZMZU4TGzERZ1x0NCnd7wUCZRk1EAAKCRARZ1x0NCnd

+761TAPsHdh+FI5/eoR1/vSKJ8nCBXVmP6xR9q5bHvknbyzcGJAD/Zq5BWgkYnfBR

+M3Ow6FM7EZ7+iAlkIRAavYHASGXERQ4=

+=QvU5

+-----END PGP SIGNATURE-----

​

@@ -4,7 +4,7 @@

 # r8168 is the Linux device driver released for Realtek Gigabit Ethernet

 # controllers with PCI-Express interface.

 #

-# Copyright(c) 2022 Realtek Semiconductor Corp. All rights reserved.

+# Copyright(c) 2023 Realtek Semiconductor Corp. All rights reserved.

 #

 # This program is free software; you can redistribute it and/or modify it

 # under the terms of the GNU General Public License as published by the Free

​

@@ -4,7 +4,7 @@

 # r8168 is the Linux device driver released for Realtek Gigabit Ethernet

 # controllers with PCI-Express interface.

 #

-# Copyright(c) 2022 Realtek Semiconductor Corp. All rights reserved.

+# Copyright(c) 2023 Realtek Semiconductor Corp. All rights reserved.

 #

 # This program is free software; you can redistribute it and/or modify it

 # under the terms of the GNU General Public License as published by the Free

@@ -44,6 +44,10 @@

 CONFIG_DYNAMIC_ASPM = y

 ENABLE_USE_FIRMWARE_FILE = n

 CONFIG_CTAP_SHORT_OFF = n

+ENABLE_MULTIPLE_TX_QUEUE = n

+ENABLE_RSS_SUPPORT = n

+ENABLE_LIB_SUPPORT = n

+DISABLE_WOL_SUPPORT = n

 ifneq ($(KERNELRELEASE),)

    obj-m := r8168.o

@@ -67,7 +71,9 @@

        r8168-objs += r8168_dash.o

        EXTRA_CFLAGS += -DENABLE_DASH_SUPPORT -DENABLE_DASH_PRINTER_SUPPORT

    endif

-   EXTRA_CFLAGS += -DCONFIG_R8168_NAPI

+   ifneq ($(ENABLE_RSS_SUPPORT), y)

+       EXTRA_CFLAGS += -DCONFIG_R8168_NAPI

+   endif

    EXTRA_CFLAGS += -DCONFIG_R8168_VLAN

    ifeq ($(CONFIG_DOWN_SPEED_100), y)

        EXTRA_CFLAGS += -DCONFIG_DOWN_SPEED_100

@@ -97,6 +103,20 @@

    ifeq ($(CONFIG_CTAP_SHORT_OFF), y)

        EXTRA_CFLAGS += -DCONFIG_CTAP_SHORT_OFF

    endif

+   ifeq ($(ENABLE_MULTIPLE_TX_QUEUE), y)

+       EXTRA_CFLAGS += -DENABLE_MULTIPLE_TX_QUEUE

+   endif

+   ifeq ($(ENABLE_RSS_SUPPORT), y)

+       r8168-objs += r8168_rss.o

+       EXTRA_CFLAGS += -DENABLE_RSS_SUPPORT

+   endif

+   ifeq ($(ENABLE_LIB_SUPPORT), y)

+       r8168-objs += r8168_lib.o

+       EXTRA_CFLAGS += -DENABLE_LIB_SUPPORT

+   endif

+   ifeq ($(DISABLE_WOL_SUPPORT), y)

+       EXTRA_CFLAGS += -DDISABLE_WOL_SUPPORT

+   endif

 else

    BASEDIR := /lib/modules/$(shell uname -r)

    KERNELDIR ?= $(BASEDIR)/build

​

@@ -4,7 +4,7 @@

 # r8168 is the Linux device driver released for Realtek Gigabit Ethernet

 # controllers with PCI-Express interface.

 #

-# Copyright(c) 2022 Realtek Semiconductor Corp. All rights reserved.

+# Copyright(c) 2023 Realtek Semiconductor Corp. All rights reserved.

 #

 # This program is free software; you can redistribute it and/or modify it

 # under the terms of the GNU General Public License as published by the Free

​

@@ -5,7 +5,7 @@

 # r8168 is the Linux device driver released for Realtek Gigabit Ethernet

 # controllers with PCI-Express interface.

 #

-# Copyright(c) 2022 Realtek Semiconductor Corp. All rights reserved.

+# Copyright(c) 2023 Realtek Semiconductor Corp. All rights reserved.

 #

 # This program is free software; you can redistribute it and/or modify it

 # under the terms of the GNU General Public License as published by the Free

@@ -33,9 +33,21 @@

  ***********************************************************************************/

 #include <linux/ethtool.h>

+#include <linux/interrupt.h>

+#include <linux/version.h>

 #include "r8168_dash.h"

 #include "r8168_realwow.h"

 #include "r8168_fiber.h"

+#include "r8168_rss.h"

+#ifdef ENABLE_LIB_SUPPORT

+#include "r8168_lib.h"

+#endif

+

+/*

+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,12,0)&& !defined(ENABLE_LIB_SUPPORT)

+#define RTL_USE_NEW_INTR_API

+#endif

+*/

 #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,32)

 typedef int netdev_tx_t;

@@ -130,11 +142,14 @@

 #endif

 #endif //LINUX_VERSION_CODE < KERNEL_VERSION(4,0,0)

-#define RTL_ALLOC_SKB_INTR(tp, length) dev_alloc_skb(length)

+#define RTL_ALLOC_SKB_INTR(napi, length) dev_alloc_skb(length)

+#define R8168_USE_NAPI_ALLOC_SKB 0

 #ifdef CONFIG_R8168_NAPI

 #if LINUX_VERSION_CODE >= KERNEL_VERSION(3,19,0)

 #undef RTL_ALLOC_SKB_INTR

-#define RTL_ALLOC_SKB_INTR(tp, length) napi_alloc_skb(&tp->napi, length)

+#define RTL_ALLOC_SKB_INTR(napi, length) napi_alloc_skb(napi, length)

+#undef R8168_USE_NAPI_ALLOC_SKB

+#define R8168_USE_NAPI_ALLOC_SKB 1

 #endif

 #endif

@@ -319,7 +334,7 @@

 #ifndef NET_IP_ALIGN

 #define NET_IP_ALIGN        2

 #endif

-#define RTK_RX_ALIGN        8

+#define RTK_RX_ALIGN        NET_IP_ALIGN

 #ifdef CONFIG_R8168_NAPI

 #define NAPI_SUFFIX "-NAPI"

@@ -343,13 +358,18 @@

 #else

 #define DASH_SUFFIX ""

 #endif

+#if defined(ENABLE_RSS_SUPPORT)

+#define RSS_SUFFIX "-RSS"

+#else

+#define RSS_SUFFIX ""

+#endif

-#define RTL8168_VERSION "8.051.02" NAPI_SUFFIX FIBER_SUFFIX REALWOW_SUFFIX DASH_SUFFIX

+#define RTL8168_VERSION "8.052.01" NAPI_SUFFIX FIBER_SUFFIX REALWOW_SUFFIX DASH_SUFFIX RSS_SUFFIX

 #define MODULENAME "r8168"

 #define PFX MODULENAME ": "

 #define GPL_CLAIM "\

-r8168  Copyright (C) 2022 Realtek NIC software team <nicfae@realtek.com> \n \

+r8168  Copyright (C) 2023 Realtek NIC software team <nicfae@realtek.com> \n \

 This program comes with ABSOLUTELY NO WARRANTY; for details, please see <http://www.gnu.org/licenses/>. \n \

 This is free software, and you are welcome to redistribute it under certain conditions; see <http://www.gnu.org/licenses/>. \n"

@@ -428,6 +448,8 @@

 #define R8168_PCI_REGS_SIZE    (0x100)

 #define R8168_NAPI_WEIGHT   64

+#define R8168_MAX_MSIX_VEC   4

+

 #define RTL8168_TX_TIMEOUT  (6 * HZ)

 #define RTL8168_LINK_TIMEOUT    (1 * HZ)

 #define RTL8168_ESD_TIMEOUT (2 * HZ)

@@ -438,10 +460,17 @@

 #define MIN_NUM_TX_DESC 32    /* Minimum number of Tx descriptor registers */

 #define MIN_NUM_RX_DESC 32    /* Minimum number of Rx descriptor registers */

-#define NUM_TX_DESC 256    /* Number of Tx descriptor registers */

-#define NUM_RX_DESC 256    /* Number of Rx descriptor registers */

+#define NUM_TX_DESC 1024    /* Number of Tx descriptor registers */

+#define NUM_RX_DESC 1024    /* Number of Rx descriptor registers */

-#define RX_BUF_SIZE 0x05F3  /* 0x05F3 = 1522bye + 1 */

+#define RX_BUF_SIZE 0x05F2  /* 0x05F2 = 1522bye */

+#define R8168_MAX_TX_QUEUES (2)

+#define R8168_MAX_RX_QUEUES (4)

+#define R8168_MAX_QUEUES R8168_MAX_RX_QUEUES

+#define R8168_MULTI_TX_Q(tp) (rtl8168_tot_tx_rings(tp) > 1)

+#define R8168_MULTI_RX_Q(tp) (rtl8168_tot_rx_rings(tp) > 1)

+#define R8168_MULTI_RX_4Q(tp) (rtl8168_tot_rx_rings(tp) > 3)

+#define R8168_MULTI_RSS_4Q(tp) (tp->num_hw_tot_en_rx_rings > 3)

 #define OCP_STD_PHY_BASE   0xa400

@@ -566,7 +595,11 @@

 typedef struct napi_struct *napi_ptr;

 typedef int napi_budget;

+#if LINUX_VERSION_CODE >= KERNEL_VERSION(6,1,0)

+#define RTL_NAPI_CONFIG(ndev, priv, function, weight)   netif_napi_add_weight(ndev, &priv->napi, function, weight)

+#else

 #define RTL_NAPI_CONFIG(ndev, priv, function, weight)   netif_napi_add(ndev, &priv->napi, function, weight)

+#endif //LINUX_VERSION_CODE >= KERNEL_VERSION(6,1,0)

 #define RTL_NAPI_QUOTA(budget, ndev)            min(budget, budget)

 #define RTL_GET_PRIV(stuct_ptr, priv_struct)        container_of(stuct_ptr, priv_struct, stuct_ptr)

 #define RTL_GET_NETDEV(priv_ptr)            struct net_device *dev = priv_ptr->dev;

@@ -1095,13 +1128,20 @@

         ERIAR           = 0x74,

         EPHY_RXER_NUM   = 0x7C,

         EPHYAR          = 0x80,

+        IntrMask1       = 0x84,

+        IntrMask2       = 0x85,

+        IntrStatus1     = 0x86,

+        IntrStatus2     = 0x87,

         TimeInt2        = 0x8C,

+        Rss_indir_tbl   = 0x90,

         OCPDR           = 0xB0,

         MACOCP          = 0xB0,

         OCPAR           = 0xB4,

         SecMAC0         = 0xB4,

         SecMAC4         = 0xB8,

         PHYOCP          = 0xB8,

+        IntrMask3       = 0xC0,

+        IntrStatus3     = 0xC1,

         DBG_reg         = 0xD1,

         TwiCmdReg       = 0xD2,

         MCUCmd_reg      = 0xD3,

@@ -1122,6 +1162,14 @@

         CMAC_IBIMR0     = 0xFA,

         CMAC_IBISR0     = 0xFB,

         FuncForceEvent  = 0xFC,

+

+        /* ERI */

+        RSS_KEY_8168    = 0x90,

+        RSS_CTRL_8168   = 0xB8,

+        Q_NUM_CTRL_8168 = 0xC0,

+

+        /* MAC OCP */

+        EEE_TXIDLE_TIMER_8168   = 0xe048,

 };

 enum RTL8168_register_content {

@@ -1137,6 +1185,8 @@

         TxOK        = 0x0004,

         RxErr       = 0x0002,

         RxOK        = 0x0001,

+        RxDU1       = 0x0002,

+        RxOK1       = 0x0001,

         /* RxStatusDesc */

         RxRWT = (1 << 22),

@@ -1181,6 +1231,7 @@

         RxCfg_fet_multi_en = (1 << 14),

         RxCfg_half_refetch = (1 << 13),

         RxCfg_9356SEL = (1 << 6),

+        RxCfg_rx_desc_v2_en = (1 << 24),

         /* TxConfigBits */

         TxInterFrameGapShift = 24,

@@ -1435,6 +1486,17 @@

         BIT_31 = (1 << 31)

 };

+#define RTL8168_CP_NUM 4

+#define RTL8168_MAX_SUPPORT_cp_len 110

+

+enum rtl8168_cp_status {

+        rtl8168_cp_normal = 0,

+        rtl8168_cp_short,

+        rtl8168_cp_open,

+        rtl8168_cp_mismatch,

+        rtl8168_cp_unknown

+};

+

 enum effuse {

         EFUSE_NOT_SUPPORT = 0,

         EFUSE_SUPPORT_V1,

@@ -1455,6 +1517,29 @@

         u64 addr;

 };

+struct RxDescV2 {

+        u32 opts1;

+        u32 opts2;

+        u64 addr;

+        u32 rsvd1;

+        u32 RSSResult;

+        u64 rsvd2;

+};

+

+//Rx Desc Type

+enum rx_desc_ring_type {

+        RX_DESC_RING_TYPE_UNKNOWN=0,

+        RX_DESC_RING_TYPE_1,

+        RX_DESC_RING_TYPE_2,

+        RX_DESC_RING_TYPE_3,

+        RX_DESC_RING_TYPE_MAX

+};

+

+enum rx_desc_len {

+        RX_DESC_LEN_TYPE_1 = (sizeof(struct RxDesc)),

+        RX_DESC_LEN_TYPE_2 = (sizeof(struct RxDescV2))

+};

+

 struct ring_info {

         struct sk_buff  *skb;

         u32     len;

@@ -1481,6 +1566,14 @@

         u32 pci_sn_h;

 };

+enum r8168_flag {

+        R8168_FLAG_DOWN = 0,

+        R8168_FLAG_TASK_RESET_PENDING,

+        R8168_FLAG_TASK_ESD_CHECK_PENDING,

+        R8168_FLAG_TASK_LINKCHG_CHECK_PENDING,

+        R8168_FLAG_MAX

+};

+

 /* Flow Control Settings */

 enum rtl8168_fc_mode {

         rtl8168_fc_none = 0,

@@ -1490,17 +1583,222 @@

         rtl8168_fc_default

 };

-struct rtl8168_private {

-        void __iomem *mmio_addr;    /* memory map physical address */

-        struct pci_dev *pci_dev;    /* Index of PCI device */

-        struct net_device *dev;

+struct rtl8168_tx_ring {

+        void* priv;

+        u32 index;

+        u32 cur_tx; /* Index into the Tx descriptor buffer of next Rx pkt. */

+        u32 dirty_tx;

+        u32 num_tx_desc; /* Number of Tx descriptor registers */

+        u32 tdu; /* Tx descriptor unavailable count */

+        struct TxDesc *TxDescArray; /* 256-aligned Tx descriptor ring */

+        dma_addr_t TxPhyAddr;

+        u32 TxDescAllocSize;

+        struct ring_info tx_skbNUM_TX_DESC; /* Tx data buffers */

+

+        u16 tdsar_reg; /* Transmit Descriptor Start Address */

+};

+

+struct rtl8168_rx_ring {

+        void* priv;

+        u32 index;

+        u32 cur_rx; /* Index into the Rx descriptor buffer of next Rx pkt. */

+        u32 dirty_rx;

+        u32 rdu; /* Rx descriptor unavailable count */

+        //struct RxDesc *RxDescArray; /* 256-aligned Rx descriptor ring */

+        //u32 RxDescAllocSize;

+        u64 RxDescPhyAddrMAX_NUM_RX_DESC; /* Rx desc physical address*/

+        //dma_addr_t RxPhyAddr;

+        struct sk_buff *Rx_skbuffMAX_NUM_RX_DESC; /* Rx data buffers */

+

+        //u16 rdsar_reg; /* Receive Descriptor Start Address */

+};

+

+struct r8168_napi {

 #ifdef CONFIG_R8168_NAPI

 #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,24)

         struct napi_struct napi;

 #endif

 #endif

+        void* priv;

+        int index;

+};

+

+struct r8168_irq {

+        irq_handler_t  handler;

+        unsigned int   vector;

+        u8     requested;

+        char       nameIFNAMSIZ + 10;

+};

+

+#pragma pack(1)

+struct rtl8168_regs {

+        //00

+        u8 mac_id6;

+        u16 reg_06;

+        u8 mar8;

+        //10

+        u64 dtccr;

+        u16 ledsel0;

+        u16 legreg;

+        u32 tctr3;

+        //20

+        u32 txq0_dsc_st_addr_0;

+        u32 txq0_dsc_st_addr_2;

+        u64 reg_28;

+        //30

+        u16 rit;

+        u16 ritc;

+        u16 reg_34;

+        u8 reg_36;

+        u8 command;

+        u32 imr0;

+        u32 isr0;

+        //40

+        u32 tcr;

+        u32 rcr;

+        u32 tctr0;

+        u32 tctr1;

+        //50

+        u8 cr93c46;

+        u8 config0;

+        u8 config1;

+        u8 config2;

+        u8 config3;

+        u8 config4;

+        u8 config5;

+        u8 tdfnr;

+        u32 timer_int0;

+        u32 timer_int1;

+        //60

+        u32 gphy_mdcmdio;

+        u32 csidr;

+        u32 csiar;

+        u16 phy_status;

+        u8 config6;

+        u8 pmch;

+        //70

+        u32 eridr;

+        u32 eriar;

+        u16 config7;

+        u16 reg_7a;

+        u32 ephy_rxerr_cnt;

+        //80

+        u32 ephy_mdcmdio;

+        u16 ledsel2;

+        u16 ledsel1;

+        u32 tctr2;

+        u32 timer_int2;

+        //90

+        u8 tppoll0;

+        u8 reg_91;

+        u16 reg_92;

+        u16 led_feature;

+        u16 ledsel3;

+        u16 eee_led_config;

+        u16 reg_9a;

+        u32 reg_9c;

+        //a0

+        u32 reg_a0;

+        u32 reg_a4;

+        u32 reg_a8;

+        u32 reg_ac;

+        //b0

+        u32 patch_dbg;

+        u32 reg_b4;

+        u32 gphy_ocp;

+        u32 reg_bc;

+        //c0

+        u32 reg_c0;

+        u32 reg_c4;

+        u32 reg_c8;

+        u16 otp_cmd;

+        u16 otp_pg_config;

+        //d0

+        u16 phy_pwr;

+        u8 twsi_ctrl;

+        u8 oob_ctrl;

+        u16 mac_dbgo;

+        u16 mac_dbg;

+        u16 reg_d8;

+        u16 rms;

+        u32 efuse_data;

+        //e0

+        u16 cplus_cmd;

+        u16 reg_e2;

+        u32 rxq0_dsc_st_addr_0;

+        u32 rxq0_dsc_st_addr_2;

+        u16 reg_ec;

+        u16 tx10midle_cnt;

+        //f0

+        u16 misc0;

+        u16 misc1;

+        u32 timer_int3;

+        u32 cmac_ib;

+        u16 reg_fc;

+        u16 sw_rst;

+};

+#pragma pack()

+

+struct rtl8168_regs_save {

+        union {

+                u8 mac_ioR8168_MAC_REGS_SIZE;

+

+                struct rtl8168_regs mac_reg;

+        };

+        u16 pcie_phyR8168_EPHY_REGS_SIZE/2;

+        u16 eth_phyR8168_PHY_REGS_SIZE/2;

+        u32 eri_regR8168_ERI_REGS_SIZE/4;

+        u32 pci_regR8168_PCI_REGS_SIZE/4;

+

+        //ktime_t begin_ktime;

+        //ktime_t end_ktime;

+        //u64 duration_ns;

+

+

+        u16 int_miti_rxq0;

+

+        u8 int_config;

+        u32 imr_new;

+        u32 isr_new;

+

+        u8 tdu_status;

+        u16 rdu_status;

+

+        u32 rss_ctrl;

+        u8 rss_keyRTL8168_RSS_KEY_SIZE;

+        u8 rss_i_tableRTL8168_MAX_INDIRECTION_TABLE_ENTRIES;

+        u16 rss_queue_num_sel_r;

+};

+

+struct rtl8168_counters {

+        /* legacy */

+        u64 tx_packets;

+        u64 rx_packets;

+        u64 tx_errors;

+        u32 rx_errors;

+        u16 rx_missed;

+        u16 align_errors;

+        u32 tx_one_collision;

+        u32 tx_multi_collision;

+        u64 rx_unicast;

+        u64 rx_broadcast;

+        u32 rx_multicast;

+        u16 tx_aborted;

+        u16 tx_underrun;

+};

+

+struct rtl8168_private {

+        void __iomem *mmio_addr;    /* memory map physical address */

+        struct pci_dev *pci_dev;    /* Index of PCI device */

+        struct pci_dev *pdev_cmac;  /* Index of PCI device */

+        struct net_device *dev;

+        struct r8168_napi r8168napiR8168_MAX_MSIX_VEC;

+        struct r8168_irq irq_tblR8168_MAX_MSIX_VEC;

+        unsigned int irq_nvecs;

+        unsigned int max_irq_nvecs;

+        unsigned int min_irq_nvecs;

+        unsigned int hw_supp_irq_nvecs;

         struct net_device_stats stats;  /* statistics of net device */

-        spinlock_t lock;        /* spin lock flag */

         u32 msg_enable;

         u32 tx_tcp_csum_cmd;

         u32 tx_udp_csum_cmd;

@@ -1509,23 +1807,35 @@

         int max_jumbo_frame_size;

         int chipset;

         u32 mcfg;

-        u32 cur_rx; /* Index into the Rx descriptor buffer of next Rx pkt. */

-        u32 cur_tx; /* Index into the Tx descriptor buffer of next Rx pkt. */

-        u32 dirty_rx;

-        u32 dirty_tx;

+        //u32 cur_rx; /* Index into the Rx descriptor buffer of next Rx pkt. */

+        // u32 cur_tx; /* Index into the Tx descriptor buffer of next Rx pkt. */

+        //u32 dirty_rx;

+        //u32 dirty_tx;

         u32 num_rx_desc; /* Number of Rx descriptor registers */

-        u32 num_tx_desc; /* Number of Tx descriptor registers */

-        struct TxDesc *TxDescArray; /* 256-aligned Tx descriptor ring */

+        //u32 num_tx_desc; /* Number of Tx descriptor registers */

+        //struct TxDesc *TxDescArray; /* 256-aligned Tx descriptor ring */

         struct RxDesc *RxDescArray; /* 256-aligned Rx descriptor ring */

-        dma_addr_t TxPhyAddr;

+        //dma_addr_t TxPhyAddr;

         dma_addr_t RxPhyAddr;

-        u32 TxDescAllocSize;

+        //u32 TxDescAllocSize;

         u32 RxDescAllocSize;

-        struct sk_buff *Rx_skbuffMAX_NUM_RX_DESC; /* Rx data buffers */

-        struct ring_info tx_skbMAX_NUM_TX_DESC;   /* Tx data buffers */

+        //struct sk_buff *Rx_skbuffMAX_NUM_RX_DESC; /* Rx data buffers */

+        //struct ring_info tx_skbMAX_NUM_TX_DESC;   /* Tx data buffers */

         unsigned rx_buf_sz;

-        struct timer_list esd_timer;

-        struct timer_list link_timer;

+        u16 HwSuppNumTxQueues; // Number of tx ring that hardware can support

+        u16 HwSuppNumRxQueues; // Number of rx ring that hardware can support

+        unsigned int num_tx_rings; // Number of tx ring that non-ring-lib driver used

+        unsigned int num_rx_rings; // Number of rx ring that non-ring-lib driver used

+        struct rtl8168_tx_ring tx_ringR8168_MAX_TX_QUEUES; // non-ring-lib tx ring

+        struct rtl8168_rx_ring rx_ringR8168_MAX_RX_QUEUES; // non-ring-lib rx ring

+#ifdef ENABLE_LIB_SUPPORT

+        struct blocking_notifier_head lib_nh;

+        struct rtl8168_ring lib_tx_ringR8168_MAX_TX_QUEUES; // ring-lib tx ring

+        struct rtl8168_ring lib_rx_ringR8168_MAX_RX_QUEUES; // ring-lib rx ring

+#endif

+        u16 num_hw_tot_en_rx_rings; // Number of rx ring that hardware enabled

+        //struct timer_list esd_timer;

+        //struct timer_list link_timer;

         struct pci_resource pci_cfg_space;

         unsigned int esd_flag;

         unsigned int pci_cfg_is_read;

@@ -1533,7 +1843,8 @@

         u16 cp_cmd;

         u16 intr_mask;

         u16 timer_intr_mask;

-        int irq;

+        u16 isr_regR8168_MAX_MSIX_VEC;

+        u16 imr_regR8168_MAX_MSIX_VEC;

         int phy_auto_nego_reg;

         int phy_1000_ctrl_reg;

         u8 org_mac_addrNODE_ADDRESS_SIZE;

@@ -1566,10 +1877,15 @@

         unsigned int (*phy_reset_pending)(struct net_device *);

         unsigned int (*link_ok)(struct net_device *);

 #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,20)

-        struct work_struct task;

+        struct work_struct reset_task;

+        struct work_struct esd_task;

+        struct work_struct linkchg_task;

 #else

-        struct delayed_work task;

+        struct delayed_work reset_task;

+        struct delayed_work esd_task;

+        struct delayed_work linkchg_task;

 #endif

+        DECLARE_BITMAP(task_flags, R8168_FLAG_MAX);

         unsigned features;

         u8 org_pci_offset_99;

@@ -1640,6 +1956,8 @@

         u16 BackupPhyFuseDout_47_32;

         u16 BackupPhyFuseDout_63_48;

+        u8 ring_lib_enabled;

+

         const char *fw_name;

         struct rtl8168_fw *rtl_fw;

         u32 ocp_base;

@@ -1649,7 +1967,6 @@

         u8 DASH;

         u8 dash_printer_enabled;

         u8 HwPkgDet;

-        void __iomem *mapped_cmac_ioaddr; /* mapped cmac memory map physical address */

         void __iomem *cmac_ioaddr; /* cmac memory map physical address */

 #ifdef ENABLE_DASH_SUPPORT

@@ -1725,8 +2042,7 @@

         //Realwow--------------

 #endif //ENABLE_REALWOW_SUPPORT

-        u32 eee_adv_t;

-        u8 eee_enabled;

+        struct ethtool_eee eee;

         u32 dynamic_aspm_packet_count;

@@ -1734,8 +2050,132 @@

         //Procfs support

         struct proc_dir_entry *proc_dir;

 #endif

+        u8 HwSuppRxDescType;

+        u8 InitRxDescType;

+        u16 RxDescLength; //V1 16 Byte V2 32 Bytes

+

+        u8 HwSuppRssVer;

+        u8 EnableRss;

+        u16 HwSuppIndirTblEntries;

+#ifdef ENABLE_RSS_SUPPORT

+        u32 rss_flags;

+        /* Receive Side Scaling settings */

+#define RTL8168_RSS_KEY_SIZE     40  /* size of RSS Hash Key in bytes */

+        u8 rss_keyRTL8168_RSS_KEY_SIZE;

+#define RTL8168_MAX_INDIRECTION_TABLE_ENTRIES 128

+        u8 rss_indir_tblRTL8168_MAX_INDIRECTION_TABLE_ENTRIES;

+        u32 rss_options;

+#endif

+        u32 rx_fifo_of; /* Rx fifo overflow count */

 };

+#ifdef ENABLE_LIB_SUPPORT

+static inline unsigned int

+rtl8168_num_lib_tx_rings(struct rtl8168_private *tp)

+{

+        int count, i;

+

+        for (count = 0, i = tp->num_tx_rings; i < tp->HwSuppNumTxQueues; i++)

+                if(tp->lib_tx_ringi.enabled)

+                        count++;

+

+        return count;

+}

+

+static inline unsigned int

+rtl8168_num_lib_rx_rings(struct rtl8168_private *tp)

+{

+        int count, i;

+

+        for (count = 0, i = tp->num_rx_rings; i < tp->HwSuppNumRxQueues; i++)

+                if(tp->lib_rx_ringi.enabled)

+                        count++;

+

+        return count;

+}

+

+static inline bool

+rtl8168_lib_tx_ring_released(struct rtl8168_private *tp)

+{

+        int i;

+        bool released = 0;

+

+        for (i = tp->num_tx_rings; i < tp->HwSuppNumTxQueues; i++) {

+                struct rtl8168_ring *ring = &tp->lib_tx_ringi;

+                if (ring->allocated)

+                        goto exit;

+        }

+

+        released = 1;

+

+exit:

+        return released;

+}

+

+static inline bool

+rtl8168_lib_rx_ring_released(struct rtl8168_private *tp)

+{

+        int i;

+        bool released = 0;

+

+        for (i = tp->num_rx_rings; i < tp->HwSuppNumRxQueues; i++) {

+                struct rtl8168_ring *ring = &tp->lib_rx_ringi;

+                if (ring->allocated)

+                        goto exit;

+        }

+

+        released = 1;

+

+exit:

+        return released;

+}

+

+#else

+

+static inline unsigned int

+rtl8168_num_lib_tx_rings(struct rtl8168_private *tp)

+{

+        return 0;

+}

+

+static inline unsigned int

+rtl8168_num_lib_rx_rings(struct rtl8168_private *tp)

+{

+        return 0;

+}

+

+static inline bool

+rtl8168_lib_tx_ring_released(struct rtl8168_private *tp)

+{

+        return 1;

+}

+

+static inline bool

+rtl8168_lib_rx_ring_released(struct rtl8168_private *tp)

+{

+        return 1;

+}

+#endif

+

+static inline unsigned int

+rtl8168_tot_tx_rings(struct rtl8168_private *tp)

+{

+        return tp->num_tx_rings + rtl8168_num_lib_tx_rings(tp);

+}

+

+static inline unsigned int

+rtl8168_tot_rx_rings(struct rtl8168_private *tp)

+{

+        return tp->num_rx_rings + rtl8168_num_lib_rx_rings(tp);

+}

+

+static inline bool

+rtl8168_lib_all_ring_released(struct rtl8168_private *tp)

+{

+        return (rtl8168_lib_tx_ring_released(tp) &&

+                rtl8168_lib_rx_ring_released(tp));

+}

+

 enum eetype {

         EEPROM_TYPE_NONE=0,

         EEPROM_TYPE_93C46,

@@ -1779,6 +2219,8 @@

         CFG_METHOD_33,

         CFG_METHOD_34,

         CFG_METHOD_35,

+        CFG_METHOD_36,

+        CFG_METHOD_37,

         CFG_METHOD_MAX,

         CFG_METHOD_DEFAULT = 0xFF

 };

@@ -1817,14 +2259,17 @@

 #define NIC_RAMCODE_VERSION_CFG_METHOD_23 (0x0015)

 #define NIC_RAMCODE_VERSION_CFG_METHOD_26 (0x0012)

 #define NIC_RAMCODE_VERSION_CFG_METHOD_28 (0x0019)

-#define NIC_RAMCODE_VERSION_CFG_METHOD_29 (0x0055)

+#define NIC_RAMCODE_VERSION_CFG_METHOD_29 (0x0083)

 #define NIC_RAMCODE_VERSION_CFG_METHOD_31 (0x0003)

-#define NIC_RAMCODE_VERSION_CFG_METHOD_35 (0x0019)

+#define NIC_RAMCODE_VERSION_CFG_METHOD_35 (0x0027)

+#define NIC_RAMCODE_VERSION_CFG_METHOD_36 (0x0000)

 //hwoptimize

 #define HW_PATCH_SOC_LAN (BIT_0)

 #define HW_PATCH_SAMSUNG_LAN_DONGLE (BIT_2)

+static const u8 other_q_intr_mask = (RxOK1 | RxDU1);

+

 #define HW_PHY_STATUS_INI       1

 #define HW_PHY_STATUS_EXT_INI   2

 #define HW_PHY_STATUS_LAN_ON    3

@@ -1862,11 +2307,84 @@

 void rtl8168_dash2_disable_rx(struct rtl8168_private *tp);

 void rtl8168_dash2_enable_rx(struct rtl8168_private *tp);

 void rtl8168_hw_disable_mac_mcu_bps(struct net_device *dev);

+void rtl8168_mark_to_asic(struct RxDesc *desc, u32 rx_buf_sz);

+

+static inline struct RxDesc*

+rtl8168_get_rxdesc(struct rtl8168_private *tp, struct RxDesc *RxDescBase, u32 const cur_rx, u32 const q_num)

+{

+        u8 *desc = (u8*)RxDescBase;

+        u32 offset;

+

+        WARN_ON_ONCE(q_num >= tp->num_hw_tot_en_rx_rings);

+

+        if (tp->InitRxDescType == RX_DESC_RING_TYPE_2)

+                offset = (cur_rx * tp->num_hw_tot_en_rx_rings) + q_num;

+        else

+                offset = cur_rx;

+

+        offset *= tp->RxDescLength;

+        desc += offset;

+

+        return (struct RxDesc*)desc;

+}

+

+static inline void

+rtl8168_disable_interrupt_by_vector(struct rtl8168_private *tp,

+                                    u32 message_id)

+{

+        if (message_id >= R8168_MAX_MSIX_VEC)

+                return;

+

+        if (message_id == 0) {

+                RTL_W16(tp, tp->imr_reg0, 0x0000);

+#ifdef ENABLE_DASH_SUPPORT

+                if (tp->DASH)

+                        rtl8168_disable_dash2_interrupt(tp);

+#endif

+        } else

+                RTL_W8(tp, tp->imr_regmessage_id, 0x00);

+}

+

+static inline void

+rtl8168_enable_interrupt_by_vector(struct rtl8168_private *tp,

+                                   u32 message_id)

+{

+        if (message_id >= R8168_MAX_MSIX_VEC)

+                return;

+

+        if (message_id == 0) {

+                RTL_W16(tp, tp->imr_reg0, tp->intr_mask);

+#ifdef ENABLE_DASH_SUPPORT

+                if (tp->DASH)

+                        rtl8168_enable_dash2_interrupt(tp);

+#endif

+        } else {

+                RTL_W8(tp, tp->imr_regmessage_id, other_q_intr_mask);

+        }

+}

+

+int rtl8168_open(struct net_device *dev);

+int rtl8168_close(struct net_device *dev);

+void rtl8168_hw_config(struct net_device *dev);

+void rtl8168_hw_start(struct net_device *dev);

+void rtl8168_hw_reset(struct net_device *dev);

+void rtl8168_tx_clear(struct rtl8168_private *tp);

+void rtl8168_rx_clear(struct rtl8168_private *tp);

+int rtl8168_init_ring(struct net_device *dev);

+int rtl8168_dump_tally_counter(struct rtl8168_private *tp, dma_addr_t paddr);

+void rtl8168_enable_napi(struct rtl8168_private *tp);

+void _rtl8168_wait_for_quiescence(struct net_device *dev);

+

+#ifndef ENABLE_LIB_SUPPORT

+static inline void rtl8168_lib_reset_prepare(struct rtl8168_private *tp) { }

+static inline void rtl8168_lib_reset_complete(struct rtl8168_private *tp) { }

+#endif

 #define HW_SUPPORT_CHECK_PHY_DISABLE_MODE(_M)        ((_M)->HwSuppCheckPhyDisableModeVer > 0 )

 #define HW_SUPP_SERDES_PHY(_M)        ((_M)->HwSuppSerDesPhyVer > 0)

 #define HW_HAS_WRITE_PHY_MCU_RAM_CODE(_M)        (((_M)->HwHasWrRamCodeToMicroP == TRUE) ? 1 : 0)

 #define HW_SUPPORT_UPS_MODE(_M)        ((_M)->HwSuppUpsVer > 0)

+#define HW_RSS_SUPPORT_RSS(_M)        ((_M)->HwSuppRssVer > 0)

 #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,34)

 #define netdev_mc_count(dev) ((dev)->mc_count)

​

@@ -5,7 +5,7 @@

 # r8168 is the Linux device driver released for Realtek Gigabit Ethernet

 # controllers with PCI-Express interface.

 #

-# Copyright(c) 2022 Realtek Semiconductor Corp. All rights reserved.

+# Copyright(c) 2023 Realtek Semiconductor Corp. All rights reserved.

 #

 # This program is free software; you can redistribute it and/or modify it

 # under the terms of the GNU General Public License as published by the Free

@@ -60,7 +60,6 @@

         struct rtl8168_private *tp = netdev_priv(dev);

         void *user_data = ifr->ifr_data;

         struct asf_ioctl_struct asf_usrdata;

-        unsigned long flags;

         if (tp->mcfg != CFG_METHOD_7 && tp->mcfg != CFG_METHOD_8)

                 return -EOPNOTSUPP;

@@ -68,8 +67,6 @@

         if (copy_from_user(&asf_usrdata, user_data, sizeof(struct asf_ioctl_struct)))

                 return -EFAULT;

-        spin_lock_irqsave(&tp->lock, flags);

-

         switch (asf_usrdata.offset) {

         case HBPeriod:

                 rtl8168_asf_hbperiod(tp, asf_usrdata.arg, asf_usrdata.u.data);

@@ -192,12 +189,9 @@

                 rtl8168_asf_key_access(tp, asf_usrdata.arg, KR, asf_usrdata.u.data);

                 break;

         default:

-                spin_unlock_irqrestore(&tp->lock, flags);

                 return -EOPNOTSUPP;

         }

-        spin_unlock_irqrestore(&tp->lock, flags);

-

         if (copy_to_user(user_data, &asf_usrdata, sizeof(struct asf_ioctl_struct)))

                 return -EFAULT;

​