Imported version 8.048.03

M4rQu1Nh0S · May 30, 2020 · 07c0397 · 07c0397
1 parent 99e62b7
commit 07c0397
Show file tree

Hide file tree

Showing 3 changed files with 174 additions and 69 deletions.
diff --git a/src/r8168.h b/src/r8168.h
@@ -335,7 +335,7 @@ do { \
 #define DASH_SUFFIX ""
 #endif
 
-#define RTL8168_VERSION "8.048.02" NAPI_SUFFIX FIBER_SUFFIX REALWOW_SUFFIX DASH_SUFFIX
+#define RTL8168_VERSION "8.048.03" NAPI_SUFFIX FIBER_SUFFIX REALWOW_SUFFIX DASH_SUFFIX
 #define MODULENAME "r8168"
 #define PFX MODULENAME ": "
 
@@ -1571,6 +1571,8 @@ struct rtl8168_private {
         u32 HwFiberStat;
         u8 HwSwitchMdiToFiber;
 
+        u8 HwSuppSerDesPhyVer;
+
         u8 HwSuppPhyOcpVer;
 
         u16 NicCustLedValue;
@@ -1807,6 +1809,8 @@ void rtl8168_dash2_enable_rx(struct rtl8168_private *tp);
 void rtl8168_hw_disable_mac_mcu_bps(struct net_device *dev);
 
 #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)
 
 #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,34)
 #define netdev_mc_count(dev) ((dev)->mc_count)

diff --git a/src/r8168_fiber.h b/src/r8168_fiber.h
@@ -55,11 +55,12 @@ enum {
 void rtl8168_hw_init_fiber_nic(struct net_device *dev);
 void rtl8168_hw_fiber_nic_d3_para(struct net_device *dev);
 void rtl8168_hw_fiber_phy_config(struct net_device *dev);
-u32 rtl8168_hw_fiber_get_connect_status(struct net_device *dev);
 void rtl8168_hw_switch_mdi_to_fiber(struct net_device *dev);
 void rtl8168_hw_switch_mdi_to_nic(struct net_device *dev);
 unsigned int rtl8168_hw_fiber_link_ok(struct net_device *dev);
 void rtl8168_check_fiber_link_status(struct net_device *dev);
+void rtl8168_check_hw_fiber_mode_support(struct net_device *dev);
+void rtl8168_set_fiber_mode_software_variable(struct net_device *dev);
 
 
 #endif /* _LINUX_R8168_FIBER_H */