From 56bd17467c90dadaafd93234dc4967fb4a2a2b9e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Mork?= <bjorn@mork.no>
Date: Thu, 31 Jan 2013 08:36:05 +0000
Subject: [PATCH] --- yaml --- r: 349659 b: refs/heads/master c:
 bf414b369f158bb527f9f29174ada815f961b44c h: refs/heads/master i:   349657:
 fb0bebadbe8c7c63768c1e2f03602a661d2f8874   349655:
 e5252dcb965881258899441f74192930fbfcfa5c v: v3

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

diff --git a/[refs] b/[refs]
index 76bf88717c0b..567b279f2454 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5f1e942cb45d06968b0ce94472d97014e0e1fdc9
+refs/heads/master: bf414b369f158bb527f9f29174ada815f961b44c
diff --git a/trunk/drivers/net/usb/usbnet.c b/trunk/drivers/net/usb/usbnet.c
index 977837725726..5e33606c1366 100644
--- a/trunk/drivers/net/usb/usbnet.c
+++ b/trunk/drivers/net/usb/usbnet.c
@@ -1125,13 +1125,11 @@ 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 */
+			/* packet collected; minidriver waiting for more */
+			if (info->flags & FLAG_MULTI_PACKET)
 				goto not_drop;
-			}
+			netif_dbg(dev, tx_err, dev->net, "can't tx_fixup skb\n");
+			goto drop;
 		}
 	}
 	length = skb->len;