linux-toradex.git/drivers/net/can, branch v3.4-rc2-rt1

Remove all #inclusions of asm/system.h

2012-03-28T17:30:03+00:00

Remove all #inclusions of asm/system.h preparatory to splitting and killing
it.  Performed with the following command:

perl -p -i -e 's!^#\s*include\s*.*\n!!' `grep -Irl '^#\s*include\s*' *`

Signed-off-by: David Howells

can: peak_usb: PCAN-USB specific part: fix little endian usage

2012-03-07T14:51:01+00:00

That patch fixes some bad usage of two little-endian variables, which lead to
some warning/error when building the peak_usb driver.

Reported-by: Dan Carpenter 
Acked-by: Marc Kleine-Budde 
Signed-off-by: Stephane Grosjean 
Signed-off-by: Marc Kleine-Budde

can: usb: PEAK-System Technik PCAN-USB Pro specific part

2012-03-03T16:40:58+00:00

This patch adds the specific part which handles the PCAN-USB Pro adapter
from PEAK-System Technik (http://www.peak-system.com). The PCAN-USB Pro
adapter is a dual-channel USB 2.0 adapter compliant with CAN specifications

Tested-by: Oliver Hartkopp 
Acked-by: Wolfgang Grandegger 
Signed-off-by: Stephane Grosjean 
Signed-off-by: Marc Kleine-Budde

can: usb: PEAK-System Technik PCAN-USB specific part

2012-03-03T16:40:55+00:00

This patch adds the specific part which handles the PCAN-USB adapter from
PEAK-System Technik (http://www.peak-system.com). The PCAN-USB adapter is
a sja1000 based, mono-channel USB 1.1 adapter compliant with CAN
specifications 2.0A (11-bit ID) and 2.0B (29-bit ID).

Tested-by: Oliver Hartkopp 
Acked-by: Wolfgang Grandegger 
Signed-off-by: Stephane Grosjean 
Signed-off-by: Marc Kleine-Budde

can: usb: PEAK-System Technik USB adapters driver core

2012-03-03T16:40:51+00:00

This patch adds the core of the peak_usb driver which handles PEAK-System
Technik PCAN USB adapters. It defines the parts which are common to the
PCAN-USB adapters: can network interfaces management, network-to/from-usb
data path interface, timestamps management...

Tested-by: Oliver Hartkopp 
Acked-by: Wolfgang Grandegger 
Signed-off-by: Stephane Grosjean 
Signed-off-by: Marc Kleine-Budde

can: sja1000: add support for PEAK-System PCMCIA card

2012-03-03T16:40:46+00:00

This patch adds support to the PCAN-PC Card PCMCIA card from
PEAK-System Technik (www.peak-system.com). This card is a CAN interface
for the PC Card slot. It is available as a single or dual-channel version.

Tested-by: Oliver Hartkopp 
Acked-by: Dominik Brodowski 
Signed-off-by: Stephane Grosjean 
Signed-off-by: Marc Kleine-Budde

can: peak_pci: add support of some new PEAK-System PCI cards

2012-03-03T16:40:39+00:00

This patch adds the support of some new PEAK-System PCI cards in the CAN
network sub-system. These are:

PCAN-PCIeC (PCI-ExpressCard)
PCAN-mminiPCI (mini-PCI)
PCAN-PCI (PCI next-gen)

This patch also adds the control of the blinking leds of the PCAN-PCIeC.

Tested-by: Oliver Hartkopp 
Acked-by: Wolfgang Grandegger 
Signed-off-by: Stephane Grosjean 
Signed-off-by: Marc Kleine-Budde

can: cc770: linux/can/dev.h included twice

2012-03-03T16:40:32+00:00

drivers/net/can/cc770/cc770.c included 'linux/can/dev.h' twice,
remove the duplicate.

Signed-off-by: Danny Kukawka 
Signed-off-by: Marc Kleine-Budde

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

2012-02-27T02:55:51+00:00

Conflicts:
	drivers/net/ethernet/sfc/rx.c

Overlapping changes in drivers/net/ethernet/sfc/rx.c, one to change
the rx_buf->is_page boolean into a set of u16 flags, and another to
adjust how ->ip_summed is initialized.

Signed-off-by: David S. Miller

can: sja1000: fix isr hang when hw is unplugged under load

2012-02-20T10:36:56+00:00

In the case of hotplug enabled devices (PCMCIA/PCIeC) the removal of the
hardware can cause an infinite loop in the common sja1000 isr.

Use the already retrieved status register to indicate a possible hardware
removal and double check by reading the mode register in sja1000_is_absent.

Cc: stable@kernel.org [3.2+]
Signed-off-by: Oliver Hartkopp 
Acked-by: Wolfgang Grandegger 
Signed-off-by: Marc Kleine-Budde