kernel/drivers/net/can/usb, branch linux-4.16.y

can: kvaser_usb: Increase correct stats counter in kvaser_usb_rx_can_msg()

2018-05-16T08:12:30Z

commit 6ee00865ffe4e8c8ba4a68d26db53c7ec09bbb89 upstream. Increase rx_dropped, if alloc_can_skb() fails, not tx_dropped. Signed-off-by: Jimmy Assarsson Cc: linux-stable Signed-off-by: Marc Kleine-Budde Signed-off-by: Greg Kroah-Hartman

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

2018-01-20T03:59:33Z

The BPF verifier conflict was some minor contextual issue. The TUN conflict was less trivial. Cong Wang fixed a memory leak of tfile->tx_array in 'net'. This is an skb_array. But meanwhile in net-next tun changed tfile->tx_arry into tfile->tx_ring which is a ptr_ring. Signed-off-by: David S. Miller

can: peak: fix potential bug in packet fragmentation

2018-01-16T14:33:15Z

In some rare conditions when running one PEAK USB-FD interface over a non high-speed USB controller, one useless USB fragment might be sent. This patch fixes the way a USB command is fragmented when its length is greater than 64 bytes and when the underlying USB controller is not a high-speed one. Signed-off-by: Stephane Grosjean Cc: linux-stable Signed-off-by: Marc Kleine-Budde

Merge tag 'linux-can-next-for-4.16-20180105' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/mkl/linux-can-next

2018-01-15T21:13:34Z

Marc Kleine-Budde says: ==================== pull-request: can-next 2017-12-01,Re: pull-request: can-next this is a pull request of 7 patches for net-next/master. All patches are by me. Patch 6 is for the "can_raw" protocol and add error checking to the bind() function. All other patches clean up the coding style and remove unused parameters in various CAN drivers and infrastructure. ==================== Signed-off-by: David S. Miller

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

2018-01-09T15:37:00Z

can: peak_usb: peak_usb_netif_rx(): remove unused parameter "u32 ts_high"

2018-01-05T10:12:08Z

The 4th argument of peak_usb_netif_rx() "u32 ts_high" is never used, so remove it. Suggested-by: Oleksij Rempel Signed-off-by: Marc Kleine-Budde

can: gs_usb: gs_cmd_reset(): remove unused parameter "struct gs_usb *gsusb"

2018-01-05T10:12:08Z

The 2nd parameter of gs_cmd_reset() "struct gs_usb *gsusb" is unused, so remove it. Suggested-by: Oleksij Rempel Signed-off-by: Marc Kleine-Budde

can: ems_usb: improve error reporting for error warning and error passive

2018-01-04T15:14:38Z

This patch adds the missing CAN_ERR_CRTL to cf->can_id in case of CAN_STATE_ERROR_WARNING or CAN_STATE_ERROR_PASSIVE Signed-off-by: Martin Lederhilger Signed-off-by: Marc Kleine-Budde

can: gs_usb: fix return value of the "set_bittiming" callback

2018-01-04T15:14:38Z

The "set_bittiming" callback treats a positive return value as error! For that reason "can_changelink()" will quit silently after setting the bittiming values without processing ctrlmode, restart-ms, etc. Signed-off-by: Wolfgang Grandegger Cc: linux-stable Signed-off-by: Marc Kleine-Budde

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

2017-12-10T03:09:55Z

Conflict was two parallel additions of include files to sch_generic.c, no biggie. Signed-off-by: David S. Miller