projects / packages / r8168.git / blame
| Commit | Line | Data |
|---|---|---|
| a838d1bd JR |
1 | diff -ur r8168-8.048.02/src/r8168_n.c r8168-8.048.02-256/src/r8168_n.c |
| 2 | --- r8168-8.048.02/src/r8168_n.c 2021-02-06 21:15:28.271768114 +0100 | |
| 3 | +++ r8168-8.048.02-256/src/r8168_n.c 2021-02-06 21:15:11.085159309 +0100 | |
| 4 | @@ -24389,11 +24389,11 @@ | |
| 5 | tp->advertising = advertising_mode; | |
| 6 | ||
| 7 | tp->max_jumbo_frame_size = rtl_chip_info[tp->chipset].jumbo_frame_sz; | |
| 8 | -#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,10,0) | |
| 9 | +#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,11,0) | |
| 10 | /* MTU range: 60 - hw-specific max */ | |
| 11 | dev->min_mtu = ETH_ZLEN; | |
| 12 | dev->max_mtu = tp->max_jumbo_frame_size; | |
| 13 | -#endif //LINUX_VERSION_CODE >= KERNEL_VERSION(4,10,0) | |
| 14 | +#endif //LINUX_VERSION_CODE >= KERNEL_VERSION(4,11,0) | |
| 15 | tp->eee_enabled = eee_enable; | |
| 16 | tp->eee_adv_t = MDIO_EEE_1000T | MDIO_EEE_100TX; | |
| 17 | } | |
| 18 | @@ -27421,12 +27421,12 @@ | |
| 19 | int ret = 0; | |
| 20 | unsigned long flags; | |
| 21 | ||
| 22 | -#if LINUX_VERSION_CODE < KERNEL_VERSION(4,10,0) | |
| 23 | +#if LINUX_VERSION_CODE < KERNEL_VERSION(4,11,0) | |
| 24 | if (new_mtu < ETH_ZLEN) | |
| 25 | return -EINVAL; | |
| 26 | else if (new_mtu > tp->max_jumbo_frame_size) | |
| 27 | new_mtu = tp->max_jumbo_frame_size; | |
| 28 | -#endif //LINUX_VERSION_CODE < KERNEL_VERSION(4,10,0) | |
| 29 | +#endif //LINUX_VERSION_CODE < KERNEL_VERSION(4,11,0) | |
| 30 | ||
| 31 | spin_lock_irqsave(&tp->lock, flags); | |
| 32 | dev->mtu = new_mtu; | |
| 33 | @@ -28798,7 +28798,7 @@ | |
| 34 | } | |
| 35 | #endif | |
| 36 | ||
| 37 | -#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,10,0) | |
| 38 | +#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,11,0) | |
| 39 | if (RTL_NETIF_RX_COMPLETE(dev, napi, work_done) == FALSE) return RTL_NAPI_RETURN_VALUE; | |
| 40 | #else | |
| 41 | RTL_NETIF_RX_COMPLETE(dev, napi, work_done); |