diff options
Diffstat (limited to 'drivers/net/usb/r8152.c')
| -rw-r--r-- | drivers/net/usb/r8152.c | 7 | 
1 files changed, 5 insertions, 2 deletions
diff --git a/drivers/net/usb/r8152.c b/drivers/net/usb/r8152.c index 97742708460b..f1b5201cc320 100644 --- a/drivers/net/usb/r8152.c +++ b/drivers/net/usb/r8152.c @@ -4506,6 +4506,9 @@ static int rtl8152_set_wol(struct net_device *dev, struct ethtool_wolinfo *wol)  	if (!rtl_can_wakeup(tp))  		return -EOPNOTSUPP; +	if (wol->wolopts & ~WAKE_ANY) +		return -EINVAL; +  	ret = usb_autopm_get_interface(tp->intf);  	if (ret < 0)  		goto out_set_wol; @@ -5217,8 +5220,8 @@ static int rtl8152_probe(struct usb_interface *intf,  		netdev->hw_features &= ~NETIF_F_RXCSUM;  	} -	if (le16_to_cpu(udev->descriptor.bcdDevice) == 0x3011 && -	    udev->serial && !strcmp(udev->serial, "000001000000")) { +	if (le16_to_cpu(udev->descriptor.bcdDevice) == 0x3011 && udev->serial && +	    (!strcmp(udev->serial, "000001000000") || !strcmp(udev->serial, "000002000000"))) {  		dev_info(&udev->dev, "Dell TB16 Dock, disable RX aggregation");  		set_bit(DELL_TB_RX_AGG_BUG, &tp->flags);  	}  | 
