From: Jakub Kicinski <kuba@kernel.org>
Date: Sat, 28 Nov 2020 02:25:27 +0000 (-0800)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
X-Git-Tag: Ubuntu-5.11.0-11.12~893^2~157
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=5c39f26e67c984db0fa95f9faecf06eb0198dce7;p=mirror_ubuntu-hirsute-kernel.git

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

Trivial conflict in CAN, keep the net-next + the byteswap wrapper.

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

Signed-off-by: Jakub Kicinski <kuba@kernel.org>
---

5c39f26e67c984db0fa95f9faecf06eb0198dce7
diff --cc drivers/net/can/usb/gs_usb.c
index a0336e895d94,018ca3b057a3..0487095e1fd0
--- a/drivers/net/can/usb/gs_usb.c
+++ b/drivers/net/can/usb/gs_usb.c
@@@ -330,9 -335,9 +336,9 @@@ static void gs_usb_receive_bulk_callbac
  		if (!skb)
  			return;
  
- 		cf->can_id = hf->can_id;
+ 		cf->can_id = le32_to_cpu(hf->can_id);
  
 -		cf->can_dlc = get_can_dlc(hf->can_dlc);
 +		can_frame_set_cc_len(cf, hf->can_dlc, dev->can.ctrlmode);
  		memcpy(cf->data, hf->data, 8);
  
  		/* ERROR frames tell us information about the controller */
@@@ -504,10 -509,9 +510,10 @@@ static netdev_tx_t gs_can_start_xmit(st
  
  	cf = (struct can_frame *)skb->data;
  
- 	hf->can_id = cf->can_id;
+ 	hf->can_id = cpu_to_le32(cf->can_id);
 -	hf->can_dlc = cf->can_dlc;
 -	memcpy(hf->data, cf->data, cf->can_dlc);
 +	hf->can_dlc = can_get_cc_dlc(cf, dev->can.ctrlmode);
 +
 +	memcpy(hf->data, cf->data, cf->len);
  
  	usb_fill_bulk_urb(urb, dev->udev,
  			  usb_sndbulkpipe(dev->udev, GSUSB_ENDPOINT_OUT),
@@@ -860,18 -866,19 +868,19 @@@ static struct gs_can *gs_make_candev(un
  	dev->can.bittiming_const = &dev->bt_const;
  	dev->can.do_set_bittiming = gs_usb_set_bittiming;
  
 -	dev->can.ctrlmode_supported = 0;
 +	dev->can.ctrlmode_supported = CAN_CTRLMODE_CC_LEN8_DLC;
  
- 	if (bt_const->feature & GS_CAN_FEATURE_LISTEN_ONLY)
+ 	feature = le32_to_cpu(bt_const->feature);
+ 	if (feature & GS_CAN_FEATURE_LISTEN_ONLY)
  		dev->can.ctrlmode_supported |= CAN_CTRLMODE_LISTENONLY;
  
- 	if (bt_const->feature & GS_CAN_FEATURE_LOOP_BACK)
+ 	if (feature & GS_CAN_FEATURE_LOOP_BACK)
  		dev->can.ctrlmode_supported |= CAN_CTRLMODE_LOOPBACK;
  
- 	if (bt_const->feature & GS_CAN_FEATURE_TRIPLE_SAMPLE)
+ 	if (feature & GS_CAN_FEATURE_TRIPLE_SAMPLE)
  		dev->can.ctrlmode_supported |= CAN_CTRLMODE_3_SAMPLES;
  
- 	if (bt_const->feature & GS_CAN_FEATURE_ONE_SHOT)
+ 	if (feature & GS_CAN_FEATURE_ONE_SHOT)
  		dev->can.ctrlmode_supported |= CAN_CTRLMODE_ONE_SHOT;
  
  	SET_NETDEV_DEV(netdev, &intf->dev);