r8101: Update to 1.039.00

Removed upstreamed patches.

Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
This commit is contained in:
Tianling Shen
2024-07-17 12:30:44 +08:00
parent 2ac4c65f74
commit 5a505f8c83
3 changed files with 3 additions and 31 deletions

View File

@@ -6,13 +6,12 @@ include $(TOPDIR)/rules.mk
include $(INCLUDE_DIR)/kernel.mk
PKG_NAME:=r8101
PKG_VERSION:=1.038.02
PKG_RELEASE:=3
PKG_VERSION:=1.039.00
PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
PKG_SOURCE_URL:=@IMMORTALWRT
PKG_HASH:=4141ebda97e277b5807a98b4090d7884d4463ac7a048676c72cb648ae4e8ae9e
PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
PKG_HASH:=e64e1738e71d6717dd844bf771fea4691edae63e92d7d03bb5ad2ef08e56e72b
PKG_MAINTAINER:=Tianling Shen <cnsztl@immortalwrt.org>
PKG_LICENSE:=GPL-2.0-only

View File

@@ -1,14 +0,0 @@
--- a/src/r8101.h
+++ b/src/r8101.h
@@ -492,7 +492,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, weight)
+#else
+#define RTL_NAPI_CONFIG(ndev, priv, function, weight) netif_napi_add_weight(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;

View File

@@ -1,13 +0,0 @@
--- a/src/r8101_n.c
+++ b/src/r8101_n.c
@@ -69,6 +69,10 @@ This driver is modified from r8169.c in
#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>