diff options
Diffstat (limited to 'net-misc/r8152')
| -rw-r--r-- | net-misc/r8152/Manifest | 3 | ||||
| -rw-r--r-- | net-misc/r8152/files/r8152-2.16.3-kernel-6.1-fix.patch | 46 | ||||
| -rw-r--r-- | net-misc/r8152/r8152-2.16.3.ebuild | 1 |
3 files changed, 49 insertions, 1 deletions
diff --git a/net-misc/r8152/Manifest b/net-misc/r8152/Manifest index cbcaa5b83b2d..f3d3b728c407 100644 --- a/net-misc/r8152/Manifest +++ b/net-misc/r8152/Manifest @@ -1,4 +1,5 @@ AUX r8152-2.16.3-kernel-5.19-fix.patch 1599 BLAKE2B e1300601e2dcd98729481a6d146ffcc0b55e6163c405608ed783bc56acca65654317804c1da780203d96945b49d815b6efd740a752335d4c0aa562f2ba84bbf3 SHA512 6cdb4ee02c6727d87d94fbd4058b7bbd18e3bb4542c2489d4080217ef323faddbf5b998a83dd42b8e1a1e4c1eb6f65762616382fc5fd8519db07d6dd01f83b4a +AUX r8152-2.16.3-kernel-6.1-fix.patch 1473 BLAKE2B bebafaeaed61bff9ee058ddc64fef6299703bdf9b0c2cd086c86643b362122a8d691577963b9b64f45729bfa4e72f09fe33d6c61fc195d0675bdcd7affd63d7a SHA512 4c5115946a1086d88bc19aa556782aec45fc05f3e38fab8255bb13a863bd2744c08bca0fd6ed72da8c5171fe801436665f4b10bfc22203c500460942a0a6db2d DIST r8152-2.16.3.tar.bz2 73331 BLAKE2B 9e22ee6d9d0197def782f77bfd0c88a2d8827d4f8cc0bbb1a6583ab67533cd07ba79a16cd9350272ed18c733fe809ea1ff70596627abdc65d452bdf817628bc8 SHA512 c37bf5199d3a857c9a7a12f3aa4ecfe9c04b49413aea862a053ebee24c137cd35769e5d5cc7e2bb7dd3bf9057f51ffada0b4e0c53cb3d417e05c8e3fc830705c -EBUILD r8152-2.16.3.ebuild 1186 BLAKE2B a2677a3275123439393ee103a35e5a9a7ebff7e7377d58ea0d0bced6fd83b7af0c71ae227ce23f7825e54927f769a8e0dda09ba41e48371a7d54b88f42b10738 SHA512 c0cf0f803e16fb7709e2efac79effd3a82eadcfdb80135164eaa0b63364e5ee73e347e0d733ffa90d3977852bb6fefa19f8fff70ecda41b8f1a8e295e8802428 +EBUILD r8152-2.16.3.ebuild 1235 BLAKE2B 3f057fd2b2c5d15f82120de6e7f5e1f22fd055a3584fa73c64862540b91e2847d7526a31f3d5c1862003f9844f4a92c78b679af29e347d2b63dd6fcb5b554bb4 SHA512 ed703fbbfbc8f0b6ea517eec1c658bb9e786eff313222eaa3520d78ac92e95a6ebb6adc7d92c6ac5f96ba0308ec07656ecad0702e10260744998738806d38f07 MISC metadata.xml 660 BLAKE2B 1f7bd7d75e5fc3b88b140f88b82390b09cbffed8770b73b4584f7d9114fd1b97a84f745881d424f30c1a738c332bb04bab3d651bd9734f0170164eb8158ef098 SHA512 c0258ae24671a18801a9a499869267b2c3d2d0350e1fbbf91db6fe2358326bb27551623ef93c9c9a9bebde3c08520463eae00a05802053a0f5b7ade1b0f5ea4d diff --git a/net-misc/r8152/files/r8152-2.16.3-kernel-6.1-fix.patch b/net-misc/r8152/files/r8152-2.16.3-kernel-6.1-fix.patch new file mode 100644 index 000000000000..d20db413a16b --- /dev/null +++ b/net-misc/r8152/files/r8152-2.16.3-kernel-6.1-fix.patch @@ -0,0 +1,46 @@ +https://github.com/ervinpopescu/realtek-r8152-linux/commit/0029747c3cf68dbccbebfcb560277040673dfe36.patch +From: ervinpopescu <ervin.popescu10@gmail.com> +Date: Tue, 15 Nov 2022 19:30:16 +0200 +Subject: [PATCH] Fix for linux 6.1 without breaking older kernel compatibility + +--- a/r8152.c ++++ b/r8152.c +@@ -17558,7 +17558,6 @@ static void r8156_init(struct r8152 *tp) + // break; + // } + +- + r8153b_mcu_spdown_en(tp, false); + + ocp_data = ocp_read_word(tp, MCU_TYPE_PLA, PLA_EXTRA_STATUS); +@@ -18339,7 +18338,6 @@ int rtl8152_get_settings(struct net_device *netdev, struct ethtool_cmd *cmd) + cmd->autoneg = AUTONEG_DISABLE; + } + +- + if (netif_running(netdev) && netif_carrier_ok(netdev)) { + u16 speed = rtl8152_get_speed(tp); + +@@ -19202,7 +19200,6 @@ static int rtltool_ioctl(struct r8152 *tp, struct ifreq *ifr) + } + break; + +- + case RTLTOOL_USB_OCP_WRITE_DWORD: + if (!tp->rtk_enable_diag && net_ratelimit()) + netif_warn(tp, drv, netdev, +@@ -20708,10 +20705,14 @@ static int rtl8152_probe(struct usb_interface *intf, + + usb_set_intfdata(intf, tp); + ++#if LINUX_VERSION_CODE < KERNEL_VERSION(6,1,0) + if (tp->support_2500full) + netif_napi_add(netdev, &tp->napi, r8152_poll, 256); + else + netif_napi_add(netdev, &tp->napi, r8152_poll, 64); ++#else /* LINUX_VERSION_CODE >= KERNEL_VERSION(6,1,0) */ ++ netif_napi_add(netdev, &tp->napi, r8152_poll); ++#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(6,1,0) */ + + ret = register_netdev(netdev); + if (ret != 0) { diff --git a/net-misc/r8152/r8152-2.16.3.ebuild b/net-misc/r8152/r8152-2.16.3.ebuild index bb0eb2cef113..ef6a81cfcf22 100644 --- a/net-misc/r8152/r8152-2.16.3.ebuild +++ b/net-misc/r8152/r8152-2.16.3.ebuild @@ -24,6 +24,7 @@ IUSE="+center-tap-short" # with kernel support patches. It appears to be used by the AUR maintainer. PATCHES=( "${FILESDIR}"/${PN}-2.16.3-kernel-5.19-fix.patch + "${FILESDIR}"/${PN}-2.16.3-kernel-6.1-fix.patch ) pkg_setup() { |