From 690a2dcc37a687dc99b2c78df08154f3833c31be Mon Sep 17 00:00:00 2001
From: Mark McLoughlin <markmc@redhat.com>
Date: Sun, 8 Jun 2008 20:49:00 +1000
Subject: [PATCH] --- yaml --- r: 97943 b: refs/heads/master c:
 23cde76d801246a702e7a84c3fe3d655b35c89a1 h: refs/heads/master i:   97941:
 be325527588a657907f7074eca201114d7a534f9   97939:
 c799c6acbbc2e0d5736cb4519f18fe809955a264   97935:
 023f00120bf4ddbd5e4fd8d321cea7d26e35168c v: v3

---
 [refs]                         | 2 +-
 trunk/drivers/net/virtio_net.c | 8 +++++---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index a6c8e0aac884..a7346031afdd 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 00aaea2f95d73d4e2b5e45cf77c3cbb16c59e87f
+refs/heads/master: 23cde76d801246a702e7a84c3fe3d655b35c89a1
diff --git a/trunk/drivers/net/virtio_net.c b/trunk/drivers/net/virtio_net.c
index 5450eac9e263..9a3b85e55ccc 100644
--- a/trunk/drivers/net/virtio_net.c
+++ b/trunk/drivers/net/virtio_net.c
@@ -94,9 +94,7 @@ static void receive_skb(struct net_device *dev, struct sk_buff *skb,
 	BUG_ON(len > MAX_PACKET_LEN);
 
 	skb_trim(skb, len);
-	skb->protocol = eth_type_trans(skb, dev);
-	pr_debug("Receiving skb proto 0x%04x len %i type %i\n",
-		 ntohs(skb->protocol), skb->len, skb->pkt_type);
+
 	dev->stats.rx_bytes += skb->len;
 	dev->stats.rx_packets++;
 
@@ -106,6 +104,10 @@ static void receive_skb(struct net_device *dev, struct sk_buff *skb,
 			goto frame_err;
 	}
 
+	skb->protocol = eth_type_trans(skb, dev);
+	pr_debug("Receiving skb proto 0x%04x len %i type %i\n",
+		 ntohs(skb->protocol), skb->len, skb->pkt_type);
+
 	if (hdr->gso_type != VIRTIO_NET_HDR_GSO_NONE) {
 		pr_debug("GSO!\n");
 		switch (hdr->gso_type & ~VIRTIO_NET_HDR_GSO_ECN) {