Commit 69d268b7 authored Apr 26, 2014 by David S. Miller

linux-can



Marc Kleine-Budde says:

====================
this is a pull request for net/master, for the v3.15 release cycle, consisting
of 26 patches.

Thomas Gleixner contributes 21 patches for the c_can driver, which address
several shortcomings in the driver like hardware initialisation, concurrency,
message ordering and poor performance. Two patches Oliver Hartkopp, one adds a
missing lock to the sja1000_isa driver, the other one fixes the return value in
the generic bit time configuration function. And finally a patch by Alexander
Stein, that fixes the slcan driver to use the correct spinlock variant.

To make it 26 patches, Wolfgang Grandegger patch for the c_can_pci
driver, which enables the bus master only for MSI and a patch by
Wolfram Sang, which converts the 'instance' in the c_can driver to the
proper type.
====================

Signed-off-by: David S. Miller <davem@davemloft.net>

parents 2b24f192 367525c8

drivers/net/can/c_can/Kconfig

+7 −0

Original line number	Diff line number	Diff line
		@@ -14,6 +14,13 @@ config CAN_C_CAN_PLATFORM
		SPEAr1310 and SPEAr320 evaluation boards & TI (www.ti.com)
		boards like am335x, dm814x, dm813x and dm811x.

		config CAN_C_CAN_STRICT_FRAME_ORDERING
		bool "Force a strict RX CAN frame order (may cause frame loss)"
		---help---
		The RX split buffer prevents packet reordering but can cause packet
		loss. Only enable this option when you accept to lose CAN frames
		in favour of getting the received CAN frames in the correct order.

		config CAN_C_CAN_PCI
		tristate "Generic PCI Bus based C_CAN/D_CAN driver"
		depends on PCI