git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge remote-tracking branch 'torvalds/master' into perf/core
[sfrench/cifs-2.6.git]
/
drivers
/
net
/
can
/
vcan.c
diff --git
a/drivers/net/can/vcan.c
b/drivers/net/can/vcan.c
index 39ca14b0585dc4e0497eefb1eb5f2d2c1b5d8f91..067705e2850b3650d7ffa726619170060dd25615 100644
(file)
--- a/
drivers/net/can/vcan.c
+++ b/
drivers/net/can/vcan.c
@@
-153,7
+153,7
@@
static void vcan_setup(struct net_device *dev)
dev->addr_len = 0;
dev->tx_queue_len = 0;
dev->flags = IFF_NOARP;
-
dev->ml_priv = netdev_priv(dev
);
+
can_set_ml_priv(dev, netdev_priv(dev)
);
/* set flags according to driver capabilities */
if (echo)