Commit 7b0378f5 authored by Dean Jenkins's avatar Dean Jenkins Committed by David S. Miller
Browse files

asix: Rename remaining and size for clarity 



The Data header synchronisation is easier to understand
if the variables "remaining" and "size" are renamed.

Therefore, the lifetime of the "remaining" variable exists
outside of asix_rx_fixup_internal() and is used to indicate
any remaining pending bytes of the Ethernet frame that need
to be obtained from the next socket buffer. This allows an
Ethernet frame to span across multiple socket buffers.

"size" is now local to asix_rx_fixup_internal() and contains
the size read from the Data header 32-bit word.

Add "copy_length" to hold the number of the Ethernet frame
bytes (maybe a part of a full frame) that are to be copied
out of the socket buffer.

Signed-off-by: default avatarDean Jenkins <Dean_Jenkins@mentor.com>
Signed-off-by: default avatarMark Craske <Mark_Craske@mentor.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent bab18991

drivers/net/usb/asix.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -168,7 +168,7 @@ struct asix_data { 
struct asix_rx_fixup_info {

struct asix_rx_fixup_info {

	struct sk_buff *ax_skb;

	struct sk_buff *ax_skb;

	u32 header;

	u32 header;

	u16 size;

	u16 remaining;

	bool split_head;

	bool split_head;

};

};

drivers/net/usb/asix_common.c

+21 −20
Original line number Original line Diff line number Diff line
@@ -54,12 +54,13 @@ int asix_rx_fixup_internal(struct usbnet *dev, struct sk_buff *skb, 
			   struct asix_rx_fixup_info *rx)

			   struct asix_rx_fixup_info *rx)

{

{

	int offset = 0;

	int offset = 0;

	u16 size;





	while (offset + sizeof(u16) <= skb->len) {

	while (offset + sizeof(u16) <= skb->len) {

		u16 remaining = 0;

		u16 copy_length;

		unsigned char *data;

		unsigned char *data;





		if (!rx->size) {

		if (!rx->remaining) {

			if ((skb->len - offset == sizeof(u16)) ||

			if ((skb->len - offset == sizeof(u16)) ||

			    rx->split_head) {

			    rx->split_head) {

				if(!rx->split_head) {

				if(!rx->split_head) {
@@ -81,42 +82,42 @@ int asix_rx_fixup_internal(struct usbnet *dev, struct sk_buff *skb, 
				offset += sizeof(u32);

				offset += sizeof(u32);

			}

			}





			/* get the packet length */

			/* take frame length from Data header 32-bit word */

			rx->size = (u16) (rx->header & 0x7ff);

			size = (u16)(rx->header & 0x7ff);

			if (rx->size != ((~rx->header >> 16) & 0x7ff)) {

			if (size != ((~rx->header >> 16) & 0x7ff)) {

				netdev_err(dev->net, "asix_rx_fixup() Bad Header Length 0x%x, offset %d\n",

				netdev_err(dev->net, "asix_rx_fixup() Bad Header Length 0x%x, offset %d\n",

					   rx->header, offset);

					   rx->header, offset);

				rx->size = 0;

				return 0;

				return 0;

			}

			}

			rx->ax_skb = netdev_alloc_skb_ip_align(dev->net,

			rx->ax_skb = netdev_alloc_skb_ip_align(dev->net, size);

							       rx->size);

			if (!rx->ax_skb)

			if (!rx->ax_skb)

				return 0;

				return 0;

			rx->remaining = size;

		}

		}





		if (rx->size > dev->net->mtu + ETH_HLEN + VLAN_HLEN) {

		if (rx->remaining > dev->net->mtu + ETH_HLEN + VLAN_HLEN) {

			netdev_err(dev->net, "asix_rx_fixup() Bad RX Length %d\n",

			netdev_err(dev->net, "asix_rx_fixup() Bad RX Length %d\n",

				   rx->size);

				   rx->remaining);

			kfree_skb(rx->ax_skb);

			kfree_skb(rx->ax_skb);

			rx->ax_skb = NULL;

			rx->ax_skb = NULL;

			rx->size = 0U;

			rx->remaining = 0;



			return 0;

			return 0;

		}

		}





		if (rx->size > skb->len - offset) {

		if (rx->remaining > skb->len - offset) {

			remaining = rx->size - (skb->len - offset);

			copy_length = skb->len - offset;

			rx->size = skb->len - offset;

			rx->remaining -= copy_length;

		} else {

			copy_length = rx->remaining;

			rx->remaining = 0;

		}

		}





		data = skb_put(rx->ax_skb, rx->size);

		data = skb_put(rx->ax_skb, copy_length);

		memcpy(data, skb->data + offset, rx->size);

		memcpy(data, skb->data + offset, copy_length);

		if (!remaining)

		if (!rx->remaining)

			usbnet_skb_return(dev, rx->ax_skb);

			usbnet_skb_return(dev, rx->ax_skb);





		offset += (rx->size + 1) & 0xfffe;

		offset += (copy_length + 1) & 0xfffe;

		rx->size = remaining;

	}

	}





	if (skb->len != offset) {

	if (skb->len != offset) {

CRA Git | Maintained and supported by SUSTech CRA and CCSE