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

Commit 073285fd authored by Alexey Orishko's avatar Alexey Orishko Committed by David S. Miller
Browse files

usbnet: changes for upcoming cdc_ncm driver 



Changes:
include/linux/usb/usbnet.h:
- a new flag to indicate driver's capability to accumulate IP packets in Tx
 direction and extract several packets from single skb in Rx direction.
drivers/net/usb/usbnet.c:
- the procedure of counting packets in usbnet was updated due to the
 accumulating of IP packets in the driver
- no short packets are sent if indicated by the flag in driver_info
 structure

Signed-off-by: default avatarAlexey Orishko <alexey.orishko@stericsson.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 5ee49376

drivers/net/usb/usbnet.c

+31 −14
Original line number Diff line number Diff line
@@ -391,15 +391,20 @@ static inline void rx_process (struct usbnet *dev, struct sk_buff *skb) 
		goto error;

	// else network stack removes extra byte if we forced a short packet



	if (skb->len)

	if (skb->len) {

		/* all data was already cloned from skb inside the driver */

		if (dev->driver_info->flags & FLAG_MULTI_PACKET)

			dev_kfree_skb_any(skb);

		else

			usbnet_skb_return(dev, skb);

	else {

		return;

	}



	netif_dbg(dev, rx_err, dev->net, "drop\n");

error:

	dev->net->stats.rx_errors++;

	skb_queue_tail(&dev->done, skb);

}

}



/*-------------------------------------------------------------------------*/
@@ -971,6 +976,7 @@ static void tx_complete (struct urb *urb) 
	struct usbnet		*dev = entry->dev;



	if (urb->status == 0) {

		if (!(dev->driver_info->flags & FLAG_MULTI_PACKET))

			dev->net->stats.tx_packets++;

		dev->net->stats.tx_bytes += entry->length;

	} else {
@@ -1044,8 +1050,13 @@ netdev_tx_t usbnet_start_xmit (struct sk_buff *skb, 
	if (info->tx_fixup) {

		skb = info->tx_fixup (dev, skb, GFP_ATOMIC);

		if (!skb) {

			if (netif_msg_tx_err(dev)) {

				netif_dbg(dev, tx_err, dev->net, "can't tx_fixup skb\n");

				goto drop;

			} else {

				/* cdc_ncm collected packet; waits for more */

				goto not_drop;

			}

		}

	}

	length = skb->len;
@@ -1067,14 +1078,19 @@ netdev_tx_t usbnet_start_xmit (struct sk_buff *skb, 
	/* don't assume the hardware handles USB_ZERO_PACKET

	 * NOTE:  strictly conforming cdc-ether devices should expect

	 * the ZLP here, but ignore the one-byte packet.

	 * NOTE2: CDC NCM specification is different from CDC ECM when

	 * handling ZLP/short packets, so cdc_ncm driver will make short

	 * packet itself if needed.

	 */

	if (length % dev->maxpacket == 0) {

		if (!(info->flags & FLAG_SEND_ZLP)) {

			if (!(info->flags & FLAG_MULTI_PACKET)) {

				urb->transfer_buffer_length++;

				if (skb_tailroom(skb)) {

					skb->data[skb->len] = 0;

					__skb_put(skb, 1);

				}

			}

		} else

			urb->transfer_flags |= URB_ZERO_PACKET;

	}
@@ -1122,6 +1138,7 @@ netdev_tx_t usbnet_start_xmit (struct sk_buff *skb, 
		netif_dbg(dev, tx_err, dev->net, "drop, code %d\n", retval);

drop:

		dev->net->stats.tx_dropped++;

not_drop:

		if (skb)

			dev_kfree_skb_any (skb);

		usb_free_urb (urb);

include/linux/usb/usbnet.h

+6 −0
Original line number Diff line number Diff line
@@ -97,6 +97,12 @@ struct driver_info { 


#define FLAG_LINK_INTR	0x0800		/* updates link (carrier) status */



/*

 * Indicates to usbnet, that USB driver accumulates multiple IP packets.

 * Affects statistic (counters) and short packet handling.

 */

#define FLAG_MULTI_PACKET	0x1000



	/* init device ... can sleep, or cause probe() failure */

	int	(*bind)(struct usbnet *, struct usb_interface *);