Patch "r8152: fix the rx early size of RTL8153" has been added to the 4.9-stable tree
Subsystems (3)
This is a note to let you know that I've just added the patch titled
r8152: fix the rx early size of RTL8153
to the 4.9-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
r8152-fix-the-rx-early-size-of-rtl8153.patch
and it can be found in the queue-4.9 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.
Quoted 1 line
From foo@baz Thu Dec 21 09:02:40 CET 2017
From: hayeswang <[email protected]>
Date: Mon, 20 Mar 2017 16:13:45 +0800
Subject: r8152: fix the rx early size of RTL8153
From: hayeswang <[email protected]>
[ Upstream commit b20cb60e2b865638459e6ec82ad3536d3734e555 ]
revert commit a59e6d815226 ("r8152: correct the rx early size") and fix the rx early size as
(rx buffer size - rx packet size - rx desc size - alignment) / 4
--- drivers/net/usb/r8152.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
drivers/net/usb/r8152.c +4 -3
@@ -32,7 +32,7 @@#define NETNEXT_VERSION "08"/* Information for net */ -#define NET_VERSION "8" +#define NET_VERSION "9"#define DRIVER_VERSION "v1." NETNEXT_VERSION "." NET_VERSION#define DRIVER_AUTHOR "Realtek linux nic maintainers <[email protected]>"
@@ -501,6 +501,8 @@ enum rtl_register_content {#define RTL8153_RMS RTL8153_MAX_PACKET#define RTL8152_TX_TIMEOUT (5 * HZ)#define RTL8152_NAPI_WEIGHT 64 +#define rx_reserved_size (x) ((x) + VLAN_ETH_HLEN + CRC_SIZE + \ + sizeof(struct rx_desc) + RX_ALIGN)/* rtl8152 flags */ enum rtl8152_flags {
@@ -2253,8 +2255,7 @@ static void r8153_set_rx_early_timeout(sstatic void r8153_set_rx_early_size (struct r8152 *tp) { -u32 mtu = tp->netdev->mtu; -u32 ocp_data = (agg_buf_sz - mtu -VLAN_ETH_HLEN -VLAN_HLEN ) /8 ; +u32 ocp_data = (agg_buf_sz -rx_reserved_size (tp->netdev->mtu)) /4 ;ocp_write_word (tp,MCU_TYPE_USB ,USB_RX_EARLY_SIZE , ocp_data); }
Patches currently in stable-queue which might be from [email protected] are
queue-4.9/r8152-fix-the-list-rx_done-may-be-used-without-initialization.patch queue-4.9/r8152-prevent-the-driver-from-transmitting-packets-with-carrier-off.patch queue-4.9/r8152-fix-the-rx-early-size-of-rtl8153.patch