|
Line
Link Here
|
| 0 |
-- a/src/r8168_n.c |
0 |
++ b/src/r8168_n.c |
|
Lines 95-100
Link Here
|
| 95 |
#include <linux/seq_file.h> |
95 |
#include <linux/seq_file.h> |
| 96 |
#endif |
96 |
#endif |
| 97 |
|
97 |
|
|
|
98 |
#if LINUX_VERSION_CODE >= KERNEL_VERSION(5,17,0) |
| 99 |
#define PDE_DATA pde_data |
| 100 |
#endif |
| 101 |
|
| 98 |
#define FIRMWARE_8168D_1 "rtl_nic/rtl8168d-1.fw" |
102 |
#define FIRMWARE_8168D_1 "rtl_nic/rtl8168d-1.fw" |
| 99 |
#define FIRMWARE_8168D_2 "rtl_nic/rtl8168d-2.fw" |
103 |
#define FIRMWARE_8168D_2 "rtl_nic/rtl8168d-2.fw" |
| 100 |
#define FIRMWARE_8168E_1 "rtl_nic/rtl8168e-1.fw" |
104 |
#define FIRMWARE_8168E_1 "rtl_nic/rtl8168e-1.fw" |
|
Lines 563-569
Link Here
|
| 563 |
static void rtl8168_down(struct net_device *dev); |
567 |
static void rtl8168_down(struct net_device *dev); |
| 564 |
|
568 |
|
| 565 |
static int rtl8168_set_mac_address(struct net_device *dev, void *p); |
569 |
static int rtl8168_set_mac_address(struct net_device *dev, void *p); |
| 566 |
void rtl8168_rar_set(struct rtl8168_private *tp, uint8_t *addr); |
570 |
void rtl8168_rar_set(struct rtl8168_private *tp, const uint8_t *addr); |
| 567 |
static void rtl8168_desc_addr_fill(struct rtl8168_private *); |
571 |
static void rtl8168_desc_addr_fill(struct rtl8168_private *); |
| 568 |
static void rtl8168_tx_desc_init(struct rtl8168_private *tp); |
572 |
static void rtl8168_tx_desc_init(struct rtl8168_private *tp); |
| 569 |
static void rtl8168_rx_desc_init(struct rtl8168_private *tp); |
573 |
static void rtl8168_rx_desc_init(struct rtl8168_private *tp); |
|
Lines 24129-24137
Link Here
|
| 24129 |
rtl8168_rar_set(tp, mac_addr); |
24133 |
rtl8168_rar_set(tp, mac_addr); |
| 24130 |
|
24134 |
|
| 24131 |
for (i = 0; i < MAC_ADDR_LEN; i++) { |
24135 |
for (i = 0; i < MAC_ADDR_LEN; i++) { |
|
|
24136 |
#if LINUX_VERSION_CODE < KERNEL_VERSION(5,17,0) |
| 24132 |
dev->dev_addr[i] = RTL_R8(tp, MAC0 + i); |
24137 |
dev->dev_addr[i] = RTL_R8(tp, MAC0 + i); |
| 24133 |
tp->org_mac_addr[i] = dev->dev_addr[i]; /* keep the original MAC address */ |
24138 |
tp->org_mac_addr[i] = dev->dev_addr[i]; /* keep the original MAC address */ |
|
|
24139 |
#else |
| 24140 |
mac_addr[i] = RTL_R8(tp, MAC0 + i); |
| 24141 |
tp->org_mac_addr[i] = mac_addr[i]; /* keep the original MAC address */ |
| 24142 |
#endif |
| 24134 |
} |
24143 |
} |
|
|
24144 |
#if LINUX_VERSION_CODE >= KERNEL_VERSION(5,17,0) |
| 24145 |
eth_hw_addr_set(dev, mac_addr); |
| 24146 |
#endif |
| 24135 |
#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,13) |
24147 |
#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,13) |
| 24136 |
memcpy(dev->perm_addr, dev->dev_addr, dev->addr_len); |
24148 |
memcpy(dev->perm_addr, dev->dev_addr, dev->addr_len); |
| 24137 |
#endif |
24149 |
#endif |
|
Lines 24159-24167
Link Here
|
| 24159 |
return -EADDRNOTAVAIL; |
24171 |
return -EADDRNOTAVAIL; |
| 24160 |
|
24172 |
|
| 24161 |
spin_lock_irqsave(&tp->lock, flags); |
24173 |
spin_lock_irqsave(&tp->lock, flags); |
| 24162 |
|
24174 |
#if LINUX_VERSION_CODE < KERNEL_VERSION(5,17,0) |
| 24163 |
memcpy(dev->dev_addr, addr->sa_data, dev->addr_len); |
24175 |
memcpy(dev->dev_addr, addr->sa_data, dev->addr_len); |
| 24164 |
|
24176 |
#else |
|
|
24177 |
eth_hw_addr_set(dev, addr->sa_data); |
| 24178 |
#endif |
| 24165 |
rtl8168_rar_set(tp, dev->dev_addr); |
24179 |
rtl8168_rar_set(tp, dev->dev_addr); |
| 24166 |
|
24180 |
|
| 24167 |
spin_unlock_irqrestore(&tp->lock, flags); |
24181 |
spin_unlock_irqrestore(&tp->lock, flags); |
|
Lines 24177-24183
Link Here
|
| 24177 |
*****************************************************************************/ |
24191 |
*****************************************************************************/ |
| 24178 |
void |
24192 |
void |
| 24179 |
rtl8168_rar_set(struct rtl8168_private *tp, |
24193 |
rtl8168_rar_set(struct rtl8168_private *tp, |
| 24180 |
uint8_t *addr) |
24194 |
const uint8_t *addr) |
| 24181 |
{ |
24195 |
{ |
| 24182 |
uint32_t rar_low = 0; |
24196 |
uint32_t rar_low = 0; |
| 24183 |
uint32_t rar_high = 0; |
24197 |
uint32_t rar_high = 0; |
