kernel/linux.git/drivers/net/can/usb, branch v4.3.1

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

2015-08-28T04:45:31+00:00

can: pcan_usb: don't provide CAN FD bittimings by non-FD adapters

2015-08-25T06:50:00+00:00

The CAN FD data bittiming constants are provided via netlink only when there are valid CAN FD constants available in priv->data_bittiming_const. Due to the indirection of pointer assignments in the peak_usb driver the priv->data_bittiming_const never becomes NULL - not even for non-FD adapters. The data_bittiming_const points to zero'ed data which leads to this result when running 'ip -details link show can0': 35: can0: mtu 16 qdisc noop state DOWN mode DEFAULT group default qlen 10 link/can promiscuity 0 can state STOPPED restart-ms 0 pcan_usb: tseg1 1..16 tseg2 1..8 sjw 1..4 brp 1..64 brp-inc 1 : dtseg1 0..0 dtseg2 0..0 dsjw 1..0 dbrp 0..0 dbrp-inc 0 <== BROKEN! clock 8000000 This patch changes the struct peak_usb_adapter::bittiming_const and struct peak_usb_adapter::data_bittiming_const to pointers to fix the assignemnt problems. Cc: linux-stable # >= 4.0 Reported-by: Oliver Hartkopp Tested-by: Oliver Hartkopp Signed-off-by: Marc Kleine-Budde

can: gs_usb: Fix typo in function name

2015-08-20T08:52:42+00:00

This fixes typos in gs_usb.c where 'receive' is misspelled as 'recieve'. Signed-off-by: Nik Nyby Signed-off-by: Marc Kleine-Budde

can: pcan_usb: don't touch skb after netif_rx()

2015-07-15T07:04:28+00:00

There is no guarantee that the skb is in the same state after calling net_receive_skb() or netif_rx(). It might be freed or reused. Not really harmful as its a read access, except you turn on the proper debugging options which catch a use after free. Cc: Stephane Grosjean Signed-off-by: Marc Kleine-Budde

can: usb_8dev: don't touch skb after netif_rx()

2015-07-15T07:04:28+00:00

can: ems_usb: don't touch skb after netif_rx()

2015-07-15T07:04:28+00:00

can: esd_usb2: don't touch skb after netif_rx()

2015-07-15T07:04:28+00:00

net:treewide: Fix typo in drivers/net

2015-04-27T17:40:53+00:00

This patch fix spelling typo in printk. Signed-off-by: Masanari Iida Signed-off-by: David S. Miller

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

2015-04-02T20:16:53+00:00

Conflicts: drivers/net/usb/asix_common.c drivers/net/usb/sr9800.c drivers/net/usb/usbnet.c include/linux/usb/usbnet.h net/ipv4/tcp_ipv4.c net/ipv6/tcp_ipv6.c The TCP conflicts were overlapping changes. In 'net' we added a READ_ONCE() to the socket cached RX route read, whilst in 'net-next' Eric Dumazet touched the surrounding code dealing with how mini sockets are handled. With USB, it's a case of the same bug fix first going into net-next and then I cherry picked it back into net. Signed-off-by: David S. Miller

can: pcan_usb: pcan_usb_fd_send_cmd(): silence compiler warning about uninitialized var

2015-04-01T09:49:59+00:00

This patch silences the compiler warning: drivers/net/can/usb/peak_usb/pcan_usb_fd.c: In function 'pcan_usb_fd_send_cmd': drivers/net/can/usb/peak_usb/pcan_usb_fd.c:185:6: warning: 'err' may be used uninitialized in this function [-Wuninitialized] by initialising the variable as 0. Signed-off-by: Marc Kleine-Budde