From ac47e794429758e7f6a10757872bf40278987437 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Wed, 27 Jun 2007 08:48:15 +0200
Subject: [PATCH] --- yaml --- r: 58148 b: refs/heads/master c:
 3e323f3e86196eec18d6959585aa3188d060c43b h: refs/heads/master v: v3

---
 [refs]                         | 2 +-
 trunk/drivers/net/usb/usbnet.c | 9 ++++++---
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index a3010ede3a9a..8b5dfe4062c5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 23de559b8d3537f972f325e7e015c18aa2e4d987
+refs/heads/master: 3e323f3e86196eec18d6959585aa3188d060c43b
diff --git a/trunk/drivers/net/usb/usbnet.c b/trunk/drivers/net/usb/usbnet.c
index 5b16d9a1269a..a12f576391cf 100644
--- a/trunk/drivers/net/usb/usbnet.c
+++ b/trunk/drivers/net/usb/usbnet.c
@@ -953,11 +953,14 @@ static int usbnet_start_xmit (struct sk_buff *skb, struct net_device *net)
 	/* 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.
-	 *
-	 * FIXME zero that byte, if it doesn't require a new skb.
 	 */
-	if ((length % dev->maxpacket) == 0)
+	if ((length % dev->maxpacket) == 0) {
 		urb->transfer_buffer_length++;
+		if (skb_tailroom(skb)) {
+			skb->data[skb->len] = 0;
+			__skb_put(skb, 1);
+		}
+	}
 
 	spin_lock_irqsave (&dev->txq.lock, flags);