From 9191c4b139773d84b8de2be4bf2b983da68b01ee Mon Sep 17 00:00:00 2001 From: AmadeusGhost <42570690+AmadeusGhost@users.noreply.github.com> Date: Tue, 13 Jun 2023 23:36:04 +0800 Subject: [PATCH] r8101: update to version 1.038.02 --- package/lean/r8101/Makefile | 15 +++++++-------- package/lean/r8101/patches/010-6.1-support.patch | 14 ++++++++++++++ 2 files changed, 21 insertions(+), 8 deletions(-) create mode 100644 package/lean/r8101/patches/010-6.1-support.patch diff --git a/package/lean/r8101/Makefile b/package/lean/r8101/Makefile index bae42105d..232ad16f0 100644 --- a/package/lean/r8101/Makefile +++ b/package/lean/r8101/Makefile @@ -7,17 +7,16 @@ include $(TOPDIR)/rules.mk include $(INCLUDE_DIR)/kernel.mk PKG_NAME:=r8101 -PKG_VERSION:=1.037.01 -PKG_RELEASE:=$(AUTORELEASE) +PKG_VERSION:=1.038.02 +PKG_RELEASE:=1 + +PKG_SOURCE_PROTO:=git +PKG_SOURCE_URL:=https://github.com/sbwml/package_kernel_r8101 +PKG_SOURCE_VERSION:=5dea36329c0524490c093991801973fc48d92a8b +PKG_MIRROR_HASH:=f4182719b25cd177023dddd6f0f555597c8e340fa38127566681d10be885dd9a -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 -PKG_SOURCE_URL:=https://github.com/umarizulkifli/r8101/raw/main/ -PKG_HASH:=62bb19848a87d2fe4de3fa9332225dcb5381f06cb93ec8931ea3fd894d492aea PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) -PKG_MAINTAINER:=umarizulkifli -PKG_LICENSE:=GPL-2.0-only - include $(INCLUDE_DIR)/package.mk define KernelPackage/r8101 diff --git a/package/lean/r8101/patches/010-6.1-support.patch b/package/lean/r8101/patches/010-6.1-support.patch new file mode 100644 index 000000000..489d2ebed --- /dev/null +++ b/package/lean/r8101/patches/010-6.1-support.patch @@ -0,0 +1,14 @@ +--- a/src/r8101.h +--- b/src/r8101.h +@@ -492,7 +492,11 @@ + 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_weight(ndev, &priv->napi, function, weight) ++#else + #define RTL_NAPI_CONFIG(ndev, priv, function, weight) netif_napi_add(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;