linux-stable.git/drivers/net/can/dev.c, branch linux-2.6.33.y

Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

2009-11-17T08:05:02+00:00

Conflicts:
	drivers/net/can/Kconfig

can: add the missing netlink get_xstats_size callback

2009-11-14T03:56:55+00:00

This patch adds the missing "get_xstats_size" callback for the
netlink interface, which is required if "fill_xstats" is used,
as pointed out by Patrick McHardy.

Signed-off-by: Wolfgang Grandegger 
Signed-off-by: David S. Miller

Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

2009-11-09T07:00:54+00:00

Conflicts:
	drivers/net/can/usb/ems_usb.c

net: Support specifying the network namespace upon device creation.

2009-11-08T08:53:51+00:00

There is no good reason to not support userspace specifying the
network namespace during device creation, and it makes it easier
to create a network device and pass it to a child network namespace
with a well known name.

We have to be careful to ensure that the target network namespace
for the new device exists through the life of the call.  To keep
that logic clear I have factored out the network namespace grabbing
logic into rtnl_link_get_net.

In addtion we need to continue to pass the source network namespace
to the rtnl_link_ops.newlink method so that we can find the base
device source network namespace.

Signed-off-by: Eric W. Biederman 
Acked-by: Eric Dumazet

can: fix WARN_ON dump in net/core/rtnetlink.c:rtmsg_ifinfo()

2009-11-08T08:45:48+00:00

On older kernels, e.g. 2.6.27, a WARN_ON dump in rtmsg_ifinfo()
is thrown when the CAN device is registered due to insufficient
skb space, as reported by various users. This patch adds the
rtnl_link_ops "get_size" to fix the problem. I think this patch
is required for more recent kernels as well, even if no WARN_ON
dumps are triggered. Maybe we also need "get_xstats_size" for
the CAN xstats.

Signed-off-by: Wolfgang Grandegger 
Signed-off-by: David S. Miller

can: provide library functions for skb allocation

2009-10-20T07:08:01+00:00

This patch makes the private functions alloc_can_skb() and
alloc_can_err_skb() of the at91_can driver public and adapts all
drivers to use these. While making the patch I realized, that
the skb's are *not* setup consistently. It's now done as shown
below:

  skb->protocol = htons(ETH_P_CAN);
  skb->pkt_type = PACKET_BROADCAST;
  skb->ip_summed = CHECKSUM_UNNECESSARY;
  *cf = (struct can_frame *)skb_put(skb, sizeof(struct can_frame));
  memset(*cf, 0, sizeof(struct can_frame));

The frame is zeroed out to avoid uninitialized data to be passed to
user space. Some drivers or library code did not set "pkt_type" or
"ip_summed". Also,  "__constant_htons()" should not be used for
runtime invocations, as pointed out by David Miller.

Signed-off-by: Wolfgang Grandegger 
Signed-off-by: David S. Miller

can: make the number of echo skb's configurable

2009-10-13T10:44:04+00:00

This patch allows the CAN controller driver to define the number of echo
skb's used for the local loopback (echo), as suggested by Kurt Van
Dijck, with the function:

  struct net_device *alloc_candev(int sizeof_priv,
                                  unsigned int echo_skb_max);

The CAN drivers have been adapted accordingly. For the ems_usb driver,
as suggested by Sebastian Haas, the number of echo skb's has been
increased to 10, which improves the transmission performance a lot.

Signed-off-by: Wolfgang Grandegger 
Signed-off-by: Kurt Van Dijck 
Signed-off-by: David S. Miller

can: add can_free_echo_skb() for upcoming drivers

2009-09-04T09:16:14+00:00

This patch adds the function can_free_echo_skb to the CAN
device interface to allow upcoming drivers to release echo
skb's in case of error.

Signed-off-by: Wolfgang Grandegger 
Signed-off-by: David S. Miller

drivers: Kill now superfluous ->last_rx stores

2009-09-03T06:07:36+00:00

The generic packet receive code takes care of setting
netdev->last_rx when necessary, for the sake of the
bonding ARP monitor.

Signed-off-by: Eric Dumazet 
Acked-by: Neil Horman 
Signed-off-by: David S. Miller

can: fix oops caused by wrong rtnl newlink usage

2009-08-13T23:33:01+00:00

For 'real' hardware CAN devices the netlink interface is used to set CAN
specific communication parameters. Real CAN hardware can not be created with
the ip tool ...

The invocation of 'ip link add type can' lead to an oops as the standard rtnl
newlink function was called:

http://bugzilla.kernel.org/show_bug.cgi?id=13954

This patch adds a private newlink function for the CAN device driver interface
that unconditionally returns -EOPNOTSUPP.

Signed-off-by: Oliver Hartkopp 
Reported-by: Dmitry Eremin-Solenikov 
CC: Patrick McHardy 
CC: Wolfgang Grandegger 
Signed-off-by: David S. Miller