linux-toradex.git/net/can, branch v3.3.5

can: remove references to berlios mailinglist

2011-10-17T23:22:46+00:00

The BerliOS project, which currently hosts our mailinglist, will
close with the end of the year. Now take the chance and remove all
occurrences of the mailinglist address from the source files.

Signed-off-by: Marc Kleine-Budde 
Signed-off-by: David S. Miller

Merge branch 'master' of github.com:davem330/net

2011-10-07T17:38:43+00:00

Conflicts:
	net/batman-adv/soft-interface.c

can bcm: fix incomplete tx_setup fix

2011-09-29T19:33:47+00:00

The commit aabdcb0b553b9c9547b1a506b34d55a764745870 ("can bcm: fix tx_setup
off-by-one errors") fixed only a part of the original problem reported by
Andre Naujoks. It turned out that the original code needed to be re-ordered
to reduce complexity and to finally fix the reported frame counting issues.

Signed-off-by: Oliver Hartkopp 
Signed-off-by: David S. Miller

can bcm: fix tx_setup off-by-one errors

2011-09-29T04:32:09+00:00

This patch fixes two off-by-one errors that canceled each other out.
Checking for the same condition two times in bcm_tx_timeout_tsklet() reduced
the count of frames to be sent by one. This did not show up the first time
tx_setup is invoked as an additional frame is sent due to TX_ANNONCE.
Invoking a second tx_setup on the same item led to a reduced (by 1) number of
sent frames.

Reported-by: Andre Naujoks 
Signed-off-by: Oliver Hartkopp 
Signed-off-by: David S. Miller

Merge branch 'master' of github.com:davem330/net

2011-09-22T07:23:13+00:00

Conflicts:
	MAINTAINERS
	drivers/net/Kconfig
	drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c
	drivers/net/ethernet/broadcom/tg3.c
	drivers/net/wireless/iwlwifi/iwl-pci.c
	drivers/net/wireless/iwlwifi/iwl-trans-tx-pcie.c
	drivers/net/wireless/rt2x00/rt2800usb.c
	drivers/net/wireless/wl12xx/main.c

can-gw: add netlink based CAN routing

2011-09-16T21:37:51+00:00

This patch adds a CAN Gateway/Router to route (and modify) CAN frames.

It is based on the PF_CAN core infrastructure for msg filtering and msg
sending and can optionally modify routed CAN frames on the fly.
CAN frames can *only* be routed between CAN network interfaces (one hop).
They can be modified with AND/OR/XOR/SET operations as configured by the
netlink configuration interface known e.g. from iptables. From the netlink
view this can-gw implements RTM_{NEW|DEL|GET}ROUTE for PF_CAN.

The CAN specific userspace tool to manage CAN routing entries can be found in
the CAN utils http://svn.berlios.de/wsvn/socketcan/trunk/can-utils/cangw.c
at the SocketCAN SVN on BerliOS.

Signed-off-by: Oliver Hartkopp 
Signed-off-by: David S. Miller

net/can/af_can.c: Change del_timer to del_timer_sync

2011-09-15T18:49:43+00:00

This is important for SMP platform to check if timer function is
executing on other CPU with deleting the timer.

Signed-off-by: Rajan Aggarwal 
Acked-by: Oliver Hartkopp 
Signed-off-by: David S. Miller

rcu: convert uses of rcu_assign_pointer(x, NULL) to RCU_INIT_POINTER

2011-08-02T11:29:23+00:00

When assigning a NULL value to an RCU protected pointer, no barrier
is needed. The rcu_assign_pointer, used to handle that but will soon
change to not handle the special case.

Convert all rcu_assign_pointer of NULL value.

//smpl
@@ expression P; @@

- rcu_assign_pointer(P, NULL)
+ RCU_INIT_POINTER(P, NULL)

// 

Signed-off-by: Stephen Hemminger 
Acked-by: Paul E. McKenney 
Signed-off-by: David S. Miller

net/can: use printk_ratelimited() instead of printk_ratelimit()

2011-06-17T04:03:03+00:00

Since printk_ratelimit() shouldn't be used anymore (see comment in
include/linux/printk.h), replace it with printk_ratelimited().

Signed-off-by: Manuel Zerpies 
Signed-off-by: David S. Miller

net: remove interrupt.h inclusion from netdevice.h

2011-06-07T05:55:11+00:00

* remove interrupt.g inclusion from netdevice.h -- not needed
* fixup fallout, add interrupt.h and hardirq.h back where needed.

Signed-off-by: Alexey Dobriyan 
Signed-off-by: David S. Miller