Projects
Essentials
r8168
Sign Up
Log In
Username
Password
We truncated the diff of some files because they were too big. If you want to see the full diff for every file,
click here
.
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
Expand all
Collapse all
Changes of Revision 5
View file
r8168.changes
Changed
@@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Wed Jan 10 14:37:17 UTC 2018 - werner.fink@opensuse.org + +- Update to version r8168-8.045.08 + +------------------------------------------------------------------- Thu Aug 10 12:14:26 UTC 2017 - werner@suse.de - Rework build of module, that is use obj directory
View file
r8168.spec
Changed
@@ -15,9 +15,8 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -#!BuildIgnore: enough-build-resources Name: r8168 -Version: 8.044.02 +Version: 8.045.08 Release: 0 License: GPL-2.0+ Summary: Device driver for RealTek Gigabit Ethernet controllers @@ -25,7 +24,7 @@ # http://www.realtek.com.tw/Downloads/downloadsView.aspx?Langid=1&PNid=13&PFid=5&Level=5&Conn=4&DownTypeID=3&GetDown=false#2 Url: http://www.realtek.com.tw/products/productsView.aspx?Langid=1&PNid=13&PFid=5&Level=5&Conn=4 Group: System/Kernel -Source0: 0009-r8168-8.044.02.tar.bz2 +Source0: 0010-r8168-8.045.08.tar.bz2 Source1: preamble Source2: Module.supported Patch0: r8168-kernel_version.patch @@ -36,7 +35,7 @@ BuildRequires: module-init-tools Requires: r8168-kmp BuildRoot: %{_tmppath}/%{name}-%{version}-build -ExcludeArch: s390 s390x armv6l armv6hl +ExcludeArch: s390 s390x %kernel_module_package -p preamble %description
View file
r8168-configuration.patch
Changed
@@ -3,8 +3,8 @@ 1 file changed, 1 insertion(+) --- src/Makefile -+++ src/Makefile 2017-08-10 11:57:29.034677787 +0000 -@@ -42,6 +42,7 @@ ENABLE_S0_MAGIC_PACKET = n ++++ src/Makefile 2018-01-10 14:35:59.981468278 +0000 +@@ -44,6 +44,7 @@ ENABLE_S0_MAGIC_PACKET = n ifneq ($(KERNELRELEASE),) obj-m := r8168.o r8168-objs := r8168_n.o r8168_asf.o rtl_eeprom.o rtltool.o
View file
r8168-kernel_version.patch
Changed
@@ -1,13 +1,13 @@ --- src/r8168.h | 4 ++++ - src/r8168_n.c | 2 ++ - 2 files changed, 6 insertions(+) + src/r8168_n.c | 2 +- + 2 files changed, 5 insertions(+), 1 deletion(-) --- src/r8168.h -+++ src/r8168.h 2017-08-10 11:34:04.607885256 +0000 -@@ -36,6 +36,10 @@ - #include "r8168_realwow.h" - #include "r8168_fiber.h" ++++ src/r8168.h 2018-01-10 14:30:36.443694357 +0000 +@@ -113,6 +113,10 @@ do { \ + } while (0) + #endif //LINUX_VERSION_CODE < KERNEL_VERSION(2,6,15) +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 11, 0)) +#include <linux/sched/signal.h> @@ -17,14 +17,13 @@ #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 2017-08-10 11:32:43.809331183 +0000 -@@ -25732,7 +25732,9 @@ process_pkt: ++++ src/r8168_n.c 2018-01-10 14:33:25.348444039 +0000 +@@ -27607,7 +27607,7 @@ process_pkt: + if (rtl8168_rx_vlan_skb(tp, desc, skb) < 0) rtl8168_rx_skb(tp, skb); - -+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,29) +-#if LINUX_VERSION_CODE < KERNEL_VERSION(4,11,0) ++#if LINUX_VERSION_CODE < KERNEL_VERSION(4,4,0) dev->last_rx = jiffies; -+#endif + #endif //LINUX_VERSION_CODE < KERNEL_VERSION(4,11,0) RTLDEV->stats.rx_bytes += pkt_size; - RTLDEV->stats.rx_packets++; - }
View file
0009-r8168-8.044.02.tar.bz2/src/Makefile -> 0010-r8168-8.045.08.tar.bz2/src/Makefile
Changed
@@ -33,9 +33,11 @@ ENABLE_FIBER_SUPPORT = n ENABLE_REALWOW_SUPPORT = n ENABLE_DASH_SUPPORT = n +ENABLE_DASH_PRINTER_SUPPORT = n CONFIG_DOWN_SPEED_100 = n CONFIG_ASPM = y ENABLE_S5WOL = y +ENABLE_S5_KEEP_CURR_MAC = n ENABLE_EEE = n ENABLE_S0_MAGIC_PACKET = n @@ -57,6 +59,10 @@ r8168-objs += r8168_dash.o EXTRA_CFLAGS += -DENABLE_DASH_SUPPORT endif + ifeq ($(ENABLE_DASH_PRINTER_SUPPORT), y) + r8168-objs += r8168_dash.o + EXTRA_CFLAGS += -DENABLE_DASH_SUPPORT -DENABLE_DASH_PRINTER_SUPPORT + endif EXTRA_CFLAGS += -DCONFIG_R8168_NAPI EXTRA_CFLAGS += -DCONFIG_R8168_VLAN ifeq ($(CONFIG_DOWN_SPEED_100), y) @@ -68,6 +74,9 @@ ifeq ($(ENABLE_S5WOL), y) EXTRA_CFLAGS += -DENABLE_S5WOL endif + ifeq ($(ENABLE_S5_KEEP_CURR_MAC), y) + EXTRA_CFLAGS += -DENABLE_S5_KEEP_CURR_MAC + endif ifeq ($(ENABLE_EEE), y) EXTRA_CFLAGS += -DENABLE_EEE endif
View file
0009-r8168-8.044.02.tar.bz2/src/r8168.h -> 0010-r8168-8.045.08.tar.bz2/src/r8168.h
Changed
@@ -36,6 +36,83 @@ #include "r8168_realwow.h" #include "r8168_fiber.h" +#if LINUX_VERSION_CODE < KERNEL_VERSION(3,4,0) +static inline void eth_hw_addr_random(struct net_device *dev) +{ + random_ether_addr(dev->dev_addr); +} +#endif + +#if LINUX_VERSION_CODE < KERNEL_VERSION(3,14,0) +static inline void ether_addr_copy(u8 *dst, const u8 *src) +{ + u16 *a = (u16 *)dst; + const u16 *b = (const u16 *)src; + + a[0] = b[0]; + a[1] = b[1]; + a[2] = b[2]; +} +#endif + +#if LINUX_VERSION_CODE < KERNEL_VERSION(3,15,0) +#define IS_ERR_OR_NULL(ptr) (!ptr) +#if LINUX_VERSION_CODE < KERNEL_VERSION(3,13,0) +#define reinit_completion(x) ((x)->done = 0) +#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,39) +#define pm_runtime_mark_last_busy(x) +#define pm_runtime_put_autosuspend(x) pm_runtime_put(x) +#define pm_runtime_put_sync_autosuspend(x) pm_runtime_put_sync(x) + +static inline bool pm_runtime_suspended(struct device *dev) +{ + return dev->power.runtime_status == RPM_SUSPENDED + && !dev->power.disable_depth; +} + +static inline bool pm_runtime_active(struct device *dev) +{ + return dev->power.runtime_status == RPM_ACTIVE + || dev->power.disable_depth; +} +#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,36) +#define queue_delayed_work(long_wq, work, delay) schedule_delayed_work(work, delay) +#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,34) +#define netif_printk(priv, type, level, netdev, fmt, args...) \ + do { \ + if (netif_msg_##type(priv)) \ + printk(level "%s: " fmt,(netdev)->name , ##args); \ + } while (0) + +#define netif_emerg(priv, type, netdev, fmt, args...) \ + netif_printk(priv, type, KERN_EMERG, netdev, fmt, ##args) +#define netif_alert(priv, type, netdev, fmt, args...) \ + netif_printk(priv, type, KERN_ALERT, netdev, fmt, ##args) +#define netif_crit(priv, type, netdev, fmt, args...) \ + netif_printk(priv, type, KERN_CRIT, netdev, fmt, ##args) +#define netif_err(priv, type, netdev, fmt, args...) \ + netif_printk(priv, type, KERN_ERR, netdev, fmt, ##args) +#define netif_warn(priv, type, netdev, fmt, args...) \ + netif_printk(priv, type, KERN_WARNING, netdev, fmt, ##args) +#define netif_notice(priv, type, netdev, fmt, args...) \ + netif_printk(priv, type, KERN_NOTICE, netdev, fmt, ##args) +#define netif_info(priv, type, netdev, fmt, args...) \ + netif_printk(priv, type, KERN_INFO, (netdev), fmt, ##args) +#endif +#endif +#endif +#endif +#endif + +#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,15) +#define setup_timer(_timer, _function, _data) \ +do { \ + (_timer)->function = _function; \ + (_timer)->data = _data; \ + init_timer(_timer); \ +} while (0) +#endif //LINUX_VERSION_CODE < KERNEL_VERSION(2,6,15) + #if LINUX_VERSION_CODE < KERNEL_VERSION(4,0,0) #if defined(skb_vlan_tag_present) && !defined(vlan_tx_tag_present) #define vlan_tx_tag_present skb_vlan_tag_present @@ -193,8 +270,25 @@ #else #define NAPI_SUFFIX "" #endif +#ifdef ENABLE_FIBER_SUPPORT +#define FIBER_SUFFIX "-FIBER" +#else +#define FIBER_SUFFIX "" +#endif +#ifdef ENABLE_REALWOW_SUPPORT +#define REALWOW_SUFFIX "-REALWOW" +#else +#define REALWOW_SUFFIX "" +#endif +#if defined(ENABLE_DASH_PRINTER_SUPPORT) +#define DASH_SUFFIX "-PRINTER" +#elif defined(ENABLE_DASH_SUPPORT) +#define DASH_SUFFIX "-DASH" +#else +#define DASH_SUFFIX "" +#endif -#define RTL8168_VERSION "8.044.02" NAPI_SUFFIX +#define RTL8168_VERSION "8.045.08" NAPI_SUFFIX FIBER_SUFFIX REALWOW_SUFFIX DASH_SUFFIX #define MODULENAME "r8168" #define PFX MODULENAME ": " @@ -250,14 +344,15 @@ #define TX_DMA_BURST_16 0 #define Reserved1_data 0x3F #define RxPacketMaxSize 0x3FE8 /* 16K - 1 - ETH_HLEN - VLAN - CRC... */ -#define Jumbo_Frame_2k (2 * 1024) -#define Jumbo_Frame_3k (3 * 1024) -#define Jumbo_Frame_4k (4 * 1024) -#define Jumbo_Frame_5k (5 * 1024) -#define Jumbo_Frame_6k (6 * 1024) -#define Jumbo_Frame_7k (7 * 1024) -#define Jumbo_Frame_8k (8 * 1024) -#define Jumbo_Frame_9k (9 * 1024) +#define Jumbo_Frame_1k ETH_DATA_LEN +#define Jumbo_Frame_2k (2*1024 - ETH_HLEN - VLAN_HLEN - ETH_FCS_LEN) +#define Jumbo_Frame_3k (3*1024 - ETH_HLEN - VLAN_HLEN - ETH_FCS_LEN) +#define Jumbo_Frame_4k (4*1024 - ETH_HLEN - VLAN_HLEN - ETH_FCS_LEN) +#define Jumbo_Frame_5k (5*1024 - ETH_HLEN - VLAN_HLEN - ETH_FCS_LEN) +#define Jumbo_Frame_6k (6*1024 - ETH_HLEN - VLAN_HLEN - ETH_FCS_LEN) +#define Jumbo_Frame_7k (7*1024 - ETH_HLEN - VLAN_HLEN - ETH_FCS_LEN) +#define Jumbo_Frame_8k (8*1024 - ETH_HLEN - VLAN_HLEN - ETH_FCS_LEN) +#define Jumbo_Frame_9k (9*1024 - ETH_HLEN - VLAN_HLEN - ETH_FCS_LEN) #define InterFrameGap 0x03 /* 3 means InterFrameGap = the shortest one */ #define RxEarly_off_V1 (0x07 << 11) #define RxEarly_off_V2 (1 << 11) @@ -382,7 +477,7 @@ #define RTL_RX_QUOTA(budget) *budget #define RTL_NAPI_QUOTA_UPDATE(ndev, work_done, budget) *budget -= work_done; \ ndev->quota -= work_done; -#define RTL_NETIF_RX_COMPLETE(dev, napi) netif_rx_complete(dev) +#define RTL_NETIF_RX_COMPLETE(dev, napi, work_done) netif_rx_complete(dev) #define RTL_NETIF_RX_SCHEDULE_PREP(dev, napi) netif_rx_schedule_prep(dev) #define __RTL_NETIF_RX_SCHEDULE(dev, napi) __netif_rx_schedule(dev) #define RTL_NAPI_RETURN_VALUE work_done >= work_to_do @@ -400,17 +495,21 @@ #define RTL_RX_QUOTA(budget) budget #define RTL_NAPI_QUOTA_UPDATE(ndev, work_done, budget) #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,29) -#define RTL_NETIF_RX_COMPLETE(dev, napi) netif_rx_complete(dev, napi) +#define RTL_NETIF_RX_COMPLETE(dev, napi, work_done) netif_rx_complete(dev, napi) #define RTL_NETIF_RX_SCHEDULE_PREP(dev, napi) netif_rx_schedule_prep(dev, napi) #define __RTL_NETIF_RX_SCHEDULE(dev, napi) __netif_rx_schedule(dev, napi) #endif #if LINUX_VERSION_CODE == KERNEL_VERSION(2,6,29) -#define RTL_NETIF_RX_COMPLETE(dev, napi) netif_rx_complete(napi) +#define RTL_NETIF_RX_COMPLETE(dev, napi, work_done) netif_rx_complete(napi) #define RTL_NETIF_RX_SCHEDULE_PREP(dev, napi) netif_rx_schedule_prep(napi) #define __RTL_NETIF_RX_SCHEDULE(dev, napi) __netif_rx_schedule(napi) #endif #if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,29) -#define RTL_NETIF_RX_COMPLETE(dev, napi) napi_complete(napi) +#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,19,0) +#define RTL_NETIF_RX_COMPLETE(dev, napi, work_done) napi_complete_done(napi, work_done) +#else +#define RTL_NETIF_RX_COMPLETE(dev, napi, work_done) napi_complete(napi) +#endif #define RTL_NETIF_RX_SCHEDULE_PREP(dev, napi) napi_schedule_prep(napi) #define __RTL_NETIF_RX_SCHEDULE(dev, napi) __napi_schedule(napi) #endif @@ -940,10 +1039,10 @@ FuncEventMask = 0xF4, TimeInt3 = 0xF4, FuncPresetState = 0xF8, - IBCR0 = 0xF8, - IBCR2 = 0xF9, - IBIMR0 = 0xFA, - IBISR0 = 0xFB, + CMAC_IBCR0 = 0xF8, + CMAC_IBCR2 = 0xF9, + CMAC_IBIMR0 = 0xFA, + CMAC_IBISR0 = 0xFB, FuncForceEvent = 0xFC, }; @@ -1352,13 +1451,17 @@ u8 eeprom_type; u8 autoneg; u8 duplex; - u16 speed; + u32 speed; u16 eeprom_len; u16 cur_page; u32 bios_setting; - int (*set_speed)(struct net_device *, u8 autoneg, u16 speed, u8 duplex); + int (*set_speed)(struct net_device *, u8 autoneg, u32 speed, u8 duplex); +#if LINUX_VERSION_CODE < KERNEL_VERSION(4,6,0) void (*get_settings)(struct net_device *, struct ethtool_cmd *); +#else + void (*get_settings)(struct net_device *, struct ethtool_link_ksettings *);
View file
0009-r8168-8.044.02.tar.bz2/src/r8168_dash.h -> 0010-r8168-8.045.08.tar.bz2/src/r8168_dash.h
Changed
@@ -37,8 +37,7 @@ #define SIOCDEVPRIVATE_RTLDASH SIOCDEVPRIVATE+2 enum rtl_dash_cmd { - - RTL_DASH_ARP_NS_OFFLOAD=0, + RTL_DASH_ARP_NS_OFFLOAD = 0, RTL_DASH_SET_OOB_IPMAC, RTL_DASH_NOTIFY_OOB, @@ -46,7 +45,17 @@ RTL_DASH_CHECK_SEND_BUFFER_TO_DASH_FW_COMPLETE, RTL_DASH_GET_RCV_FROM_FW_BUFFER_DATA, - RTLT_DASH_COMMAND_INVALID + RTL_FW_SET_IPV4 = 0x10, + RTL_FW_GET_IPV4, + RTL_FW_SET_IPV6, + RTL_FW_GET_IPV6, + RTL_FW_SET_EXT_SNMP, + RTL_FW_GET_EXT_SNMP, + RTL_FW_SET_WAKEUP_PATTERN, + RTL_FW_GET_WAKEUP_PATTERN, + RTL_FW_DEL_WAKEUP_PATTERN, + + RTLT_DASH_COMMAND_INVALID, }; struct rtl_dash_ip_mac { @@ -65,6 +74,41 @@ }; }; +struct settings_ipv4 { + __u32 IPv4addr; + __u32 IPv4mask; + __u32 IPv4Gateway; +}; + +struct settings_ipv6 { + __u32 reserved; + __u32 prefixLen; + __u16 IPv6addr[8]; + __u16 IPv6Gateway[8]; +}; + +struct settings_ext_snmp { + __u16 index; + __u16 oid_get_len; + __u8 oid_for_get[24]; + __u8 reserved0[26]; + __u16 value_len; + __u8 value[256]; + __u8 supported; + __u8 reserved1[27]; +}; + +struct wakeup_pattern { + __u8 index; + __u8 valid; + __u8 start; + __u8 length; + __u8 name[36]; + __u8 mask[16]; + __u8 pattern[128]; + __u32 reserved[2]; +}; + typedef struct _RX_DASH_FROM_FW_DESC { u16 length; u8 statusLowByte; @@ -94,7 +138,7 @@ typedef struct _RX_DASH_BUFFER_TYPE_2 { OSOOBHdr oobhdr; - void *RxDataBuffer; + u8 RxDataBuffer[0]; } RX_DASH_BUFFER_TYPE_2, *PRX_DASH_BUFFER_TYPE_2; @@ -127,9 +171,10 @@ #define HW_DASH_SUPPORT_DASH(_M) ((_M)->HwSuppDashVer > 0 ) #define HW_DASH_SUPPORT_TYPE_1(_M) ((_M)->HwSuppDashVer == 1 ) #define HW_DASH_SUPPORT_TYPE_2(_M) ((_M)->HwSuppDashVer == 2 ) +#define HW_DASH_SUPPORT_TYPE_3(_M) ((_M)->HwSuppDashVer == 3 ) -#define RECV_FROM_FW_BUF_SIZE (1518) -#define SEND_TO_FW_BUF_SIZE (1518) +#define RECV_FROM_FW_BUF_SIZE (1520) +#define SEND_TO_FW_BUF_SIZE (1520) #define RX_DASH_FROM_FW_OWN BIT_15 #define TX_DASH_SEND_FW_OWN BIT_15 @@ -183,6 +228,22 @@ #define CMAC_OOB_INIT 0x26 #define CMAC_OOB_RESET 0x2a +#define NO_BASE_ADDRESS 0x00000000 +#define RTL8168FP_OOBMAC_BASE 0xBAF70000 +#define RTL8168FP_CMAC_IOBASE 0xBAF20000 +#define RTL8168FP_KVM_BASE 0xBAF80400 +#define CMAC_SYNC_REG 0x20 +#define CMAC_RXDESC_OFFSET 0x90 //RX: 0x90 - 0x98 +#define CMAC_TXDESC_OFFSET 0x98 //TX: 0x98 - 0x9F + +/* cmac write/read MMIO register */ +#define RTL_CMAC_W8(reg, val8) writeb ((val8), tp->cmac_ioaddr + (reg)) +#define RTL_CMAC_W16(reg, val16) writew ((val16), tp->cmac_ioaddr + (reg)) +#define RTL_CMAC_W32(reg, val32) writel ((val32), tp->cmac_ioaddr + (reg)) +#define RTL_CMAC_R8(reg) readb (tp->cmac_ioaddr + (reg)) +#define RTL_CMAC_R16(reg) readw (tp->cmac_ioaddr + (reg)) +#define RTL_CMAC_R32(reg) ((unsigned long) readl (tp->cmac_ioaddr + (reg))) + int rtl8168_dash_ioctl(struct net_device *dev, struct ifreq *ifr); void HandleDashInterrupt(struct net_device *dev); int AllocateDashShareMemory(struct net_device *dev);
View file
0009-r8168-8.044.02.tar.bz2/src/r8168_fiber.h -> 0010-r8168-8.045.08.tar.bz2/src/r8168_fiber.h
Changed
@@ -47,11 +47,19 @@ FIBER_MODE_MAX }; +enum { + FIBER_STAT_NOT_CHECKED = 0, + FIBER_STAT_CONNECT, + FIBER_STAT_DISCONNECT, + FIBER_STAT_MAX +}; + #define HW_FIBER_MODE_ENABLED(_M) ((_M)->HwFiberModeVer > 0) void rtl8168_hw_fiber_phy_config(struct net_device *dev); +u32 rtl8168_hw_fiber_get_connect_status(struct net_device *dev); #endif /* _LINUX_R8168_FIBER_H */
View file
0009-r8168-8.044.02.tar.bz2/src/r8168_n.c -> 0010-r8168-8.045.08.tar.bz2/src/r8168_n.c
Changed
@@ -54,6 +54,7 @@ #include <linux/tcp.h> #include <linux/init.h> #include <linux/rtnetlink.h> +#include <linux/completion.h> #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,26) #include <linux/pci-aspm.h> @@ -69,6 +70,10 @@ #include <linux/moduleparam.h> #endif +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,31) +#include <linux/mdio.h> +#endif + #include <asm/io.h> #include <asm/irq.h> @@ -276,11 +281,23 @@ 0xff7e5880, Jumbo_Frame_9k), + _R("RTL8168FP/8111FP", + CFG_METHOD_31, + RxCfg_128_int_en | RxEarly_off_V2 | Rx_Single_fetch_V2 | (RX_DMA_BURST << RxCfgDMAShift), + 0xff7e5880, + Jumbo_Frame_9k), + + _R("RTL8168FP/8111FP", + CFG_METHOD_32, + RxCfg_128_int_en | RxEarly_off_V2 | Rx_Single_fetch_V2 | (RX_DMA_BURST << RxCfgDMAShift), + 0xff7e5880, + Jumbo_Frame_9k), + _R("Unknown", CFG_METHOD_DEFAULT, (RX_DMA_BURST << RxCfgDMAShift), 0xff7e5880, - RX_BUF_SIZE) + Jumbo_Frame_1k) }; #undef _R @@ -305,9 +322,9 @@ u32 msg_enable; } debug = { -1 }; -static unsigned short speed = SPEED_1000; -static int duplex = DUPLEX_FULL; -static int autoneg = AUTONEG_ENABLE; +static unsigned int speed_mode = SPEED_1000; +static unsigned int duplex_mode = DUPLEX_FULL; +static unsigned int autoneg_mode = AUTONEG_ENABLE; #ifdef CONFIG_ASPM static int aspm = 1; #else @@ -318,6 +335,11 @@ #else static int s5wol = 0; #endif +#ifdef ENABLE_S5_KEEP_CURR_MAC +static int s5_keep_curr_mac = 1; +#else +static int s5_keep_curr_mac = 0; +#endif #ifdef ENABLE_EEE static int eee_enable = 1; #else @@ -337,14 +359,14 @@ MODULE_AUTHOR("Realtek and the Linux r8168 crew <netdev@vger.kernel.org>"); MODULE_DESCRIPTION("RealTek RTL-8168 Gigabit Ethernet driver"); -module_param(speed, ushort, 0); -MODULE_PARM_DESC(speed, "force phy operation. Deprecated by ethtool (8)."); +module_param(speed_mode, uint, 0); +MODULE_PARM_DESC(speed_mode, "force phy operation. Deprecated by ethtool (8)."); -module_param(duplex, int, 0); -MODULE_PARM_DESC(duplex, "force phy operation. Deprecated by ethtool (8)."); +module_param(duplex_mode, uint, 0); +MODULE_PARM_DESC(duplex_mode, "force phy operation. Deprecated by ethtool (8)."); -module_param(autoneg, int, 0); -MODULE_PARM_DESC(autoneg, "force phy operation. Deprecated by ethtool (8)."); +module_param(autoneg_mode, uint, 0); +MODULE_PARM_DESC(autoneg_mode, "force phy operation. Deprecated by ethtool (8)."); module_param(aspm, int, 0); MODULE_PARM_DESC(aspm, "Enable ASPM."); @@ -352,6 +374,9 @@ module_param(s5wol, int, 0); MODULE_PARM_DESC(s5wol, "Enable Shutdown Wake On Lan."); +module_param(s5_keep_curr_mac, int, 0); +MODULE_PARM_DESC(s5_keep_curr_mac, "Enable Shutdown Keep Current MAC Address."); + module_param(rx_copybreak, int, 0); MODULE_PARM_DESC(rx_copybreak, "Copy breakpoint for copy-only-tiny-frames"); @@ -416,7 +441,7 @@ static void rtl8168_phy_power_up(struct net_device *dev); static void rtl8168_phy_power_down(struct net_device *dev); -static int rtl8168_set_speed(struct net_device *dev, u8 autoneg, u16 speed, u8 duplex); +static int rtl8168_set_speed(struct net_device *dev, u8 autoneg, u32 speed, u8 duplex); #ifdef CONFIG_R8168_NAPI static int rtl8168_poll(napi_ptr napi, napi_budget budget); @@ -729,17 +754,27 @@ seq_printf(m, "RequiredSecLanDonglePatch\t0x%x\n", tp->RequiredSecLanDonglePatch); seq_printf(m, "HwSuppDashVer\t0x%x\n", tp->HwSuppDashVer); seq_printf(m, "DASH\t0x%x\n", tp->DASH); + seq_printf(m, "dash_printer_enabled\t0x%x\n", tp->dash_printer_enabled); seq_printf(m, "HwSuppKCPOffloadVer\t0x%x\n", tp->HwSuppKCPOffloadVer); - seq_printf(m, "speed\t0x%x\n", speed); - seq_printf(m, "duplex\t0x%x\n", duplex); - seq_printf(m, "autoneg\t0x%x\n", autoneg); + seq_printf(m, "speed_mode\t0x%x\n", speed_mode); + seq_printf(m, "duplex_mode\t0x%x\n", duplex_mode); + seq_printf(m, "autoneg_mode\t0x%x\n", autoneg_mode); seq_printf(m, "aspm\t0x%x\n", aspm); seq_printf(m, "s5wol\t0x%x\n", s5wol); + seq_printf(m, "s5_keep_curr_mac\t0x%x\n", s5_keep_curr_mac); seq_printf(m, "eee_enable\t0x%x\n", eee_enable); seq_printf(m, "hwoptimize\t0x%lx\n", hwoptimize); seq_printf(m, "proc_init_num\t0x%x\n", proc_init_num); seq_printf(m, "s0_magic_packet\t0x%x\n", s0_magic_packet); seq_printf(m, "HwSuppMagicPktVer\t0x%x\n", tp->HwSuppMagicPktVer); + seq_printf(m, "HwSuppCheckPhyDisableModeVer\t0x%x\n", tp->HwSuppCheckPhyDisableModeVer); + seq_printf(m, "HwPkgDet\t0x%x\n", tp->HwPkgDet); + seq_printf(m, "random_mac\t0x%x\n", tp->random_mac); + seq_printf(m, "org_mac_addr\t%pM\n", tp->org_mac_addr); +#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,13) + seq_printf(m, "perm_addr\t%pM\n", dev->perm_addr); +#endif + seq_printf(m, "dev_addr\t%pM\n", dev->dev_addr); spin_unlock_irqrestore(&tp->lock, flags); seq_putc(m, '\n'); @@ -1025,17 +1060,27 @@ "RequiredSecLanDonglePatch\t0x%x\n" "HwSuppDashVer\t0x%x\n" "DASH\t0x%x\n" + "dash_printer_enabled\t0x%x\n" "HwSuppKCPOffloadVer\t0x%x\n" - "speed\t0x%x\n" - "duplex\t0x%x\n" - "autoneg\t0x%x\n" + "speed_mode\t0x%x\n" + "duplex_mode\t0x%x\n" + "autoneg_mode\t0x%x\n" "aspm\t0x%x\n" "s5wol\t0x%x\n" + "s5_keep_curr_mac\t0x%x\n" "eee_enable\t0x%x\n" "hwoptimize\t0x%lx\n" "proc_init_num\t0x%x\n" "s0_magic_packet\t0x%x\n" - "HwSuppMagicPktVer\t0x%x\n", + "HwSuppMagicPktVer\t0x%x\n" + "HwSuppCheckPhyDisableModeVer\t0x%x\n" + "HwPkgDet\t0x%x\n" + "random_mac\t0x%x\n" + "org_mac_addr\t%pM\n" +#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,13) + "perm_addr\t%pM\n" +#endif + "dev_addr\t%pM\n", MODULENAME, RTL8168_VERSION, tp->chipset, @@ -1089,17 +1134,27 @@ tp->RequiredSecLanDonglePatch, tp->HwSuppDashVer, tp->DASH, + tp->dash_printer_enabled, tp->HwSuppKCPOffloadVer, - speed, - duplex, - autoneg, + speed_mode, + duplex_mode, + autoneg_mode, aspm, s5wol, + s5_keep_curr_mac, eee_enable, hwoptimize, proc_init_num, s0_magic_packet, - tp->HwSuppMagicPktVer + tp->HwSuppMagicPktVer, + tp->HwSuppCheckPhyDisableModeVer, + tp->HwPkgDet, + tp->random_mac, + tp->org_mac_addr, +#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,13) + dev->perm_addr, +#endif
Locations
Projects
Search
Status Monitor
Help
Open Build Service
OBS Manuals
API Documentation
OBS Portal
Reporting a Bug
Contact
Mailing List
Forums
Chat (IRC)
Twitter
Open Build Service (OBS)
is an
openSUSE project
.