Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7e24b4ed authored by Chuhong Yuan's avatar Chuhong Yuan Committed by David S. Miller
Browse files

net: usb: Merge cpu_to_le32s + memcpy to put_unaligned_le32 



Merge the combo uses of cpu_to_le32s and memcpy.
Use put_unaligned_le32 instead.
This simplifies the code.

Signed-off-by: default avatarChuhong Yuan <hslester96@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent fcd4e608

drivers/net/usb/asix_common.c

+4 −5
Original line number Diff line number Diff line
@@ -221,6 +221,7 @@ struct sk_buff *asix_tx_fixup(struct usbnet *dev, struct sk_buff *skb, 
	int tailroom = skb_tailroom(skb);

	u32 packet_len;

	u32 padbytes = 0xffff0000;

	void *ptr;



	padlen = ((skb->len + 4) & (dev->maxpacket - 1)) ? 0 : 4;
@@ -256,13 +257,11 @@ struct sk_buff *asix_tx_fixup(struct usbnet *dev, struct sk_buff *skb, 
	}



	packet_len = ((skb->len ^ 0x0000ffff) << 16) + skb->len;

	skb_push(skb, 4);

	cpu_to_le32s(&packet_len);

	skb_copy_to_linear_data(skb, &packet_len, sizeof(packet_len));

	ptr = skb_push(skb, 4);

	put_unaligned_le32(packet_len, ptr);



	if (padlen) {

		cpu_to_le32s(&padbytes);

		memcpy(skb_tail_pointer(skb), &padbytes, sizeof(padbytes));

		put_unaligned_le32(padbytes, skb_tail_pointer(skb));

		skb_put(skb, sizeof(padbytes));

	}

drivers/net/usb/ax88179_178a.c

+4 −7
Original line number Diff line number Diff line
@@ -1421,6 +1421,7 @@ ax88179_tx_fixup(struct usbnet *dev, struct sk_buff *skb, gfp_t flags) 
	int frame_size = dev->maxpacket;

	int mss = skb_shinfo(skb)->gso_size;

	int headroom;

	void *ptr;



	tx_hdr1 = skb->len;

	tx_hdr2 = mss;
@@ -1435,13 +1436,9 @@ ax88179_tx_fixup(struct usbnet *dev, struct sk_buff *skb, gfp_t flags) 
		return NULL;

	}



	skb_push(skb, 4);

	cpu_to_le32s(&tx_hdr2);

	skb_copy_to_linear_data(skb, &tx_hdr2, 4);



	skb_push(skb, 4);

	cpu_to_le32s(&tx_hdr1);

	skb_copy_to_linear_data(skb, &tx_hdr1, 4);

	ptr = skb_push(skb, 8);

	put_unaligned_le32(tx_hdr1, ptr);

	put_unaligned_le32(tx_hdr2, ptr + 4);



	return skb;

}

drivers/net/usb/lan78xx.c

+4 −7
Original line number Diff line number Diff line
@@ -2729,6 +2729,7 @@ static struct sk_buff *lan78xx_tx_prep(struct lan78xx_net *dev, 
				       struct sk_buff *skb, gfp_t flags)

{

	u32 tx_cmd_a, tx_cmd_b;

	void *ptr;



	if (skb_cow_head(skb, TX_OVERHEAD)) {

		dev_kfree_skb_any(skb);
@@ -2757,13 +2758,9 @@ static struct sk_buff *lan78xx_tx_prep(struct lan78xx_net *dev, 
		tx_cmd_b |= skb_vlan_tag_get(skb) & TX_CMD_B_VTAG_MASK_;

	}



	skb_push(skb, 4);

	cpu_to_le32s(&tx_cmd_b);

	memcpy(skb->data, &tx_cmd_b, 4);



	skb_push(skb, 4);

	cpu_to_le32s(&tx_cmd_a);

	memcpy(skb->data, &tx_cmd_a, 4);

	ptr = skb_push(skb, 8);

	put_unaligned_le32(tx_cmd_a, ptr);

	put_unaligned_le32(tx_cmd_b, ptr + 4);



	return skb;

}

drivers/net/usb/smsc75xx.c

+4 −7
Original line number Diff line number Diff line
@@ -2255,6 +2255,7 @@ static struct sk_buff *smsc75xx_tx_fixup(struct usbnet *dev, 
					 struct sk_buff *skb, gfp_t flags)

{

	u32 tx_cmd_a, tx_cmd_b;

	void *ptr;



	if (skb_cow_head(skb, SMSC75XX_TX_OVERHEAD)) {

		dev_kfree_skb_any(skb);
@@ -2275,13 +2276,9 @@ static struct sk_buff *smsc75xx_tx_fixup(struct usbnet *dev, 
		tx_cmd_b = 0;

	}



	skb_push(skb, 4);

	cpu_to_le32s(&tx_cmd_b);

	memcpy(skb->data, &tx_cmd_b, 4);



	skb_push(skb, 4);

	cpu_to_le32s(&tx_cmd_a);

	memcpy(skb->data, &tx_cmd_a, 4);

	ptr = skb_push(skb, 8);

	put_unaligned_le32(tx_cmd_a, ptr);

	put_unaligned_le32(tx_cmd_b, ptr + 4);



	return skb;

}

drivers/net/usb/sr9800.c

+4 −5
Original line number Diff line number Diff line
@@ -115,6 +115,7 @@ static struct sk_buff *sr_tx_fixup(struct usbnet *dev, struct sk_buff *skb, 
	u32 padbytes = 0xffff0000;

	u32 packet_len;

	int padlen;

	void *ptr;



	padlen = ((skb->len + 4) % (dev->maxpacket - 1)) ? 0 : 4;
@@ -133,14 +134,12 @@ static struct sk_buff *sr_tx_fixup(struct usbnet *dev, struct sk_buff *skb, 
			return NULL;

	}



	skb_push(skb, 4);

	ptr = skb_push(skb, 4);

	packet_len = (((skb->len - 4) ^ 0x0000ffff) << 16) + (skb->len - 4);

	cpu_to_le32s(&packet_len);

	skb_copy_to_linear_data(skb, &packet_len, sizeof(packet_len));

	put_unaligned_le32(packet_len, ptr);



	if (padlen) {

		cpu_to_le32s(&padbytes);

		memcpy(skb_tail_pointer(skb), &padbytes, sizeof(padbytes));

		put_unaligned_le32(padbytes, skb_tail_pointer(skb));

		skb_put(skb, sizeof(padbytes));

	}