linux-stable.git/net/can, branch linux-3.6.y

can: bcm: initialize ifindex for timeouts without previous frame reception

2012-12-03T19:38:01+00:00

commit 81b401100c01d2357031e874689f89bd788d13cd upstream.

Set in the rx_ifindex to pass the correct interface index in the case of a
message timeout detection. Usually the rx_ifindex value is set at receive
time. But when no CAN frame has been received the RX_TIMEOUT notification
did not contain a valid value.

Reported-by: Andre Naujoks 
Signed-off-by: Oliver Hartkopp 
Signed-off-by: Marc Kleine-Budde 
Signed-off-by: Greg Kroah-Hartman

can: gw: Remove pointless casts

2012-07-10T20:36:17+00:00

No need to cast return value of nla_data()

Signed-off-by: Thomas Graf 
Tested-by: Oliver Hartkopp 
Acked-by: Oliver Hartkopp 
Signed-off-by: Marc Kleine-Budde

can: gw: Properly fill the netlink header when responding to RTM_GETROUTE

2012-07-10T20:36:01+00:00

 - set message type to RTM_NEWROUTE
 - relate to original request by inheriting the sequence and port number.
 - set NLM_F_MULTI because it's a dump and more messages will follow

Signed-off-by: Thomas Graf 
Tested-by: Oliver Hartkopp 
Acked-by: Oliver Hartkopp 
Signed-off-by: Marc Kleine-Budde

can: gw: Use nla_policy to validate netlink attributes

2012-07-10T20:35:41+00:00

Also use nla_get_u32() instead of nla_memcpy() to access u32 attribtues.

Signed-off-by: Thomas Graf 
Tested-by: Oliver Hartkopp 
Acked-by: Oliver Hartkopp 
Signed-off-by: Marc Kleine-Budde

can: gw: Don't bump nlmsg_len manually

2012-07-10T20:33:40+00:00

nlmsg_end() will take care of this when we finalize the message.

Signed-off-by: Thomas Graf 
Tested-by: Oliver Hartkopp 
Acked-by: Oliver Hartkopp 
Signed-off-by: Marc Kleine-Budde

can: fix sparse warning in af_can.c

2012-07-02T09:07:27+00:00

Put can_rx_alldev_list into the af_can header to fix the following
sparse warning: net/can/af_can.c:80:22: warning: symbol
'can_rx_alldev_list' was not declared. Should it be static?

Signed-off-by: Oliver Hartkopp 
Signed-off-by: Marc Kleine-Budde

canfd: add support for CAN FD in CAN_RAW sockets

2012-06-19T19:40:08+00:00

- introduce a new sockopt CAN_RAW_FD_FRAMES to allow CAN FD frames
- handle CAN frames and CAN FD frames simultaneously when enabled

Signed-off-by: Oliver Hartkopp 
Signed-off-by: Marc Kleine-Budde

canfd: add support for CAN FD in PF_CAN core

2012-06-19T19:40:01+00:00

- handle ETH_P_CAN and ETH_P_CANFD skbuffs
- update sanity checks for CAN and CAN FD
- make sure the CAN frame can pass the selected CAN netdevice on send
- bump core version and abi version to indicate the new CAN FD support

Signed-off-by: Oliver Hartkopp 
Signed-off-by: Marc Kleine-Budde

canfd: add new data structures and constants

2012-06-19T19:39:50+00:00

- add new struct canfd_frame
- check identical element offsets in struct can_frame and struct canfd_frame
- new ETH_P_CANFD definition to tag CAN FD skbs correctly
- add CAN_MTU and CANFD_MTU definitions for easy frame and mode detection
- add CAN[FD]_MAX_[DLC|DLEN] helper constants to remove hard coded values
- update existing struct can_frame with helper constants and comments

Signed-off-by: Oliver Hartkopp 
Signed-off-by: Marc Kleine-Budde

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

2012-06-15T22:51:55+00:00

Conflicts:
	net/ipv6/route.c

This deals with a merge conflict between the net-next addition of the
inetpeer network namespace ops, and Thomas Graf's bug fix in
2a0c451ade8e1783c5d453948289e4a978d417c9 which makes sure we don't
register /proc/net/ipv6_route before it is actually safe to do so.

Signed-off-by: David S. Miller