From 0dc979e791dc0b3ea396f4e35328f3bbe4167444 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Denis-Courmont?= <remi.denis-courmont@nokia.com>
Date: Wed, 23 Feb 2011 02:51:33 +0000
Subject: [PATCH] --- yaml --- r: 233839 b: refs/heads/master c:
 f5a45325284ec10a907b96052ebf2168e7166b5c h: refs/heads/master i:   233837:
 c3b63634821ceaed501497654d8b174aee1a765d   233835:
 ed9124800e87925f58429ab6b0be5f55e8146ee8   233831:
 992b87a9e709c9358aa6c13235424683348b9d1a   233823:
 32d182c0d5433e3465d5b799b179079f56793d23 v: v3

---
 [refs]                              |  2 +-
 trunk/drivers/usb/gadget/f_phonet.c | 15 ++++++++++-----
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index bb3a92f1022a..7fb1bb1b8e8b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9eb0e6f26e48ef22cc56a2b81b1572ace999f70f
+refs/heads/master: f5a45325284ec10a907b96052ebf2168e7166b5c
diff --git a/trunk/drivers/usb/gadget/f_phonet.c b/trunk/drivers/usb/gadget/f_phonet.c
index 3c6e1a058745..5e1495097ec3 100644
--- a/trunk/drivers/usb/gadget/f_phonet.c
+++ b/trunk/drivers/usb/gadget/f_phonet.c
@@ -346,14 +346,19 @@ static void pn_rx_complete(struct usb_ep *ep, struct usb_request *req)
 
 		if (unlikely(!skb))
 			break;
-		skb_add_rx_frag(skb, skb_shinfo(skb)->nr_frags, page, 0,
-				req->actual);
-		page = NULL;
 
-		if (req->actual < req->length) { /* Last fragment */
+		if (skb->len == 0) { /* First fragment */
 			skb->protocol = htons(ETH_P_PHONET);
 			skb_reset_mac_header(skb);
-			pskb_pull(skb, 1);
+			/* Can't use pskb_pull() on page in IRQ */
+			memcpy(skb_put(skb, 1), page_address(page), 1);
+		}
+
+		skb_add_rx_frag(skb, skb_shinfo(skb)->nr_frags, page,
+				skb->len == 0, req->actual);
+		page = NULL;
+
+		if (req->actual < req->length) { /* Last fragment */
 			skb->dev = dev;
 			dev->stats.rx_packets++;
 			dev->stats.rx_bytes += skb->len;