renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2025-01-16 09:34:22 +08:00
Code

Merge branch 'r8152-fix-rx-issues'

Browse Source 
Hayes Wang says:

====================
r8152: fix rx issues

The two patched are used to fix rx issues.
====================

Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
David S. Miller 2018-02-02 19:19:00 -05:00
commit 0072f0c40b
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
drivers/net/usb/r8152.c
View File

@ -1848,11 +1848,9 @@ static u8 r8152_rx_csum(struct r8152 *tp, struct rx_desc *rx_desc)
if (opts2 & RD_IPV4_CS) { if (opts2 & RD_IPV4_CS) {
if (opts3 & IPF) if (opts3 & IPF)
checksum = CHECKSUM_NONE; checksum = CHECKSUM_NONE;
else if ((opts2 & RD_UDP_CS) && (opts3 & UDPF)) else if ((opts2 & RD_UDP_CS) && !(opts3 & UDPF))
checksum = CHECKSUM_NONE; checksum = CHECKSUM_UNNECESSARY;
else if ((opts2 & RD_TCP_CS) && (opts3 & TCPF)) else if ((opts2 & RD_TCP_CS) && !(opts3 & TCPF))
checksum = CHECKSUM_NONE;
else
checksum = CHECKSUM_UNNECESSARY; checksum = CHECKSUM_UNNECESSARY;
} else if (opts2 & RD_IPV6_CS) { } else if (opts2 & RD_IPV6_CS) {
if ((opts2 & RD_UDP_CS) && !(opts3 & UDPF)) if ((opts2 & RD_UDP_CS) && !(opts3 & UDPF))
@ -3797,11 +3795,12 @@ static void set_carrier(struct r8152 *tp)
if (speed & LINK_STATUS) { if (speed & LINK_STATUS) {
if (!netif_carrier_ok(netdev)) { if (!netif_carrier_ok(netdev)) {
tp->rtl_ops.enable(tp); tp->rtl_ops.enable(tp);
set_bit(RTL8152_SET_RX_MODE, &tp->flags);
netif_stop_queue(netdev); netif_stop_queue(netdev);
napi_disable(napi); napi_disable(napi);
netif_carrier_on(netdev); netif_carrier_on(netdev);
rtl_start_rx(tp); rtl_start_rx(tp);
clear_bit(RTL8152_SET_RX_MODE, &tp->flags);
_rtl8152_set_rx_mode(netdev);
napi_enable(&tp->napi); napi_enable(&tp->napi);
netif_wake_queue(netdev); netif_wake_queue(netdev);
netif_info(tp, link, netdev, "carrier on\n"); netif_info(tp, link, netdev, "carrier on\n");
@ -4261,7 +4260,7 @@ static int rtl8152_post_reset(struct usb_interface *intf)
mutex_lock(&tp->control); mutex_lock(&tp->control);
tp->rtl_ops.enable(tp); tp->rtl_ops.enable(tp);
rtl_start_rx(tp); rtl_start_rx(tp);
rtl8152_set_rx_mode(netdev); _rtl8152_set_rx_mode(netdev);
mutex_unlock(&tp->control); mutex_unlock(&tp->control);
} }