Commit 49371a8a authored by David S. Miller's avatar David S. Miller
Browse files

Merge tag 'linux-can-fixes-for-5.12-20210320' of... 

Merge tag 'linux-can-fixes-for-5.12-20210320' of git://git.kernel.org/pub/scm/linux/kernel/git/mkl/linux-can



Marc Kleine-Budde says:

====================
pull-request: can 2021-03-20

this is a pull request of 2 patches for net/master.

The first patch is by Oliver Hartkopp. He fixes the TX-path in the
ISO-TP protocol by properly initializing the outgoing CAN frames.

The second patch is by me and reverts a patch from my previous pull
request which added MODULE_SUPPORTED_DEVICE to the peak_usb driver. In
the mean time in Linus's tree the entirely MODULE_SUPPORTED_DEVICE was
removed. So this reverts the adding of the new MODULE_SUPPORTED_DEVICE
to avoid the merge conflict.

If you prefer to resolve the merge conflict by hand, I'll send a new
pull request without that patch.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents a05b0c8c 5d7047ed

drivers/net/can/usb/peak_usb/pcan_usb_fd.c

+0 −2
Original line number Diff line number Diff line
@@ -18,8 +18,6 @@ 


MODULE_SUPPORTED_DEVICE("PEAK-System PCAN-USB FD adapter");

MODULE_SUPPORTED_DEVICE("PEAK-System PCAN-USB Pro FD adapter");

MODULE_SUPPORTED_DEVICE("PEAK-System PCAN-Chip USB");

MODULE_SUPPORTED_DEVICE("PEAK-System PCAN-USB X6 adapter");



#define PCAN_USBPROFD_CHANNEL_COUNT	2

#define PCAN_USBFD_CHANNEL_COUNT	1

net/can/isotp.c

+3 −3
Original line number Diff line number Diff line
@@ -196,7 +196,7 @@ static int isotp_send_fc(struct sock *sk, int ae, u8 flowstatus) 
	nskb->dev = dev;

	can_skb_set_owner(nskb, sk);

	ncf = (struct canfd_frame *)nskb->data;

	skb_put(nskb, so->ll.mtu);

	skb_put_zero(nskb, so->ll.mtu);



	/* create & send flow control reply */

	ncf->can_id = so->txid;
@@ -779,7 +779,7 @@ static enum hrtimer_restart isotp_tx_timer_handler(struct hrtimer *hrtimer) 
		can_skb_prv(skb)->skbcnt = 0;



		cf = (struct canfd_frame *)skb->data;

		skb_put(skb, so->ll.mtu);

		skb_put_zero(skb, so->ll.mtu);



		/* create consecutive frame */

		isotp_fill_dataframe(cf, so, ae, 0);
@@ -895,7 +895,7 @@ static int isotp_sendmsg(struct socket *sock, struct msghdr *msg, size_t size) 
	so->tx.idx = 0;



	cf = (struct canfd_frame *)skb->data;

	skb_put(skb, so->ll.mtu);

	skb_put_zero(skb, so->ll.mtu);



	/* check for single frame transmission depending on TX_DL */

	if (size <= so->tx.ll_dl - SF_PCI_SZ4 - ae - off) {