projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'driver-core-3.16-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git...
[cascardo/linux.git]
/
drivers
/
net
/
usb
/
rtl8150.c
diff --git
a/drivers/net/usb/rtl8150.c
b/drivers/net/usb/rtl8150.c
index
da2c458
..
6e87e57
100644
(file)
--- a/
drivers/net/usb/rtl8150.c
+++ b/
drivers/net/usb/rtl8150.c
@@
-878,7
+878,7
@@
static int rtl8150_probe(struct usb_interface *intf,
dev->netdev = netdev;
netdev->netdev_ops = &rtl8150_netdev_ops;
netdev->watchdog_timeo = RTL8150_TX_TIMEOUT;
-
SET_ETHTOOL_OPS(netdev, &ops)
;
+
netdev->ethtool_ops = &ops
;
dev->intr_interval = 100; /* 100ms */
if (!alloc_all_urbs(dev)) {