Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3c5dfeff authored by David S. Miller's avatar David S. Miller
Browse files

Merge tag 'linux-can-next-for-3.15-20140317' of git://gitorious.org/linux-can/linux-can-next 



linux-can-next-for-3.15-20140317

Marc Kleine-Budde says:

====================
this is a pull request of three patches for net-next/master.

It consists of a patch by Oliver Hartkopp, which unifies the MTU
settings for CAN interfaces. A patch by Christopher R. Baker populates
netdev::dev_id for udev discrimination for multi interface CAN devices.
Alexander Shiyan contributes a patch for the mcp251x driver which fixes
the regulators operation if CONFIG_REGULATOR is not enabled.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents e76070f2 76aeec83

drivers/net/can/at91_can.c

+1 −0
Original line number Diff line number Diff line
@@ -1194,6 +1194,7 @@ static const struct net_device_ops at91_netdev_ops = { 
	.ndo_open	= at91_open,

	.ndo_stop	= at91_close,

	.ndo_start_xmit	= at91_start_xmit,

	.ndo_change_mtu = can_change_mtu,

};



static ssize_t at91_sysfs_show_mb0_id(struct device *dev,

drivers/net/can/bfin_can.c

+1 −0
Original line number Diff line number Diff line
@@ -528,6 +528,7 @@ static const struct net_device_ops bfin_can_netdev_ops = { 
	.ndo_open               = bfin_can_open,

	.ndo_stop               = bfin_can_close,

	.ndo_start_xmit         = bfin_can_start_xmit,

	.ndo_change_mtu         = can_change_mtu,

};



static int bfin_can_probe(struct platform_device *pdev)

drivers/net/can/c_can/c_can.c

+1 −0
Original line number Diff line number Diff line
@@ -1277,6 +1277,7 @@ static const struct net_device_ops c_can_netdev_ops = { 
	.ndo_open = c_can_open,

	.ndo_stop = c_can_close,

	.ndo_start_xmit = c_can_start_xmit,

	.ndo_change_mtu = can_change_mtu,

};



int register_c_can_dev(struct net_device *dev)

drivers/net/can/cc770/cc770.c

+1 −0
Original line number Diff line number Diff line
@@ -823,6 +823,7 @@ static const struct net_device_ops cc770_netdev_ops = { 
	.ndo_open = cc770_open,

	.ndo_stop = cc770_close,

	.ndo_start_xmit = cc770_start_xmit,

	.ndo_change_mtu = can_change_mtu,

};



int register_cc770dev(struct net_device *dev)

drivers/net/can/flexcan.c

+1 −0
Original line number Diff line number Diff line
@@ -1011,6 +1011,7 @@ static const struct net_device_ops flexcan_netdev_ops = { 
	.ndo_open	= flexcan_open,

	.ndo_stop	= flexcan_close,

	.ndo_start_xmit	= flexcan_start_xmit,

	.ndo_change_mtu = can_change_mtu,

};



static int register_flexcandev(struct net_device *dev)