From da4691165ebd81b375ee32f704bb30a4c321e693 Mon Sep 17 00:00:00 2001
From: Stephen Hemminger <shemminger@vyatta.com>
Date: Tue, 9 Mar 2010 17:42:17 -0800
Subject: [PATCH] --- yaml --- r: 196931 b: refs/heads/master c:
 9495c282baf53ec7bfffcb9dd9f40cb10d4240e0 h: refs/heads/master i:   196929:
 b340f3d3eba796209a3bfc1d85ef3d4dfcd307f2   196927:
 167d7f59d522e4d74556b768ee6fe6e84d525d02 v: v3

---
 [refs]                                |  2 +-
 trunk/drivers/staging/hv/netvsc_drv.c | 32 ++++++++++-----------------
 2 files changed, 13 insertions(+), 21 deletions(-)

diff --git a/[refs] b/[refs]
index 1ce2c0ed16d3..7169bdc4c410 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b852fdcefc782b6751f96a8ea09471efd844b6bf
+refs/heads/master: 9495c282baf53ec7bfffcb9dd9f40cb10d4240e0
diff --git a/trunk/drivers/staging/hv/netvsc_drv.c b/trunk/drivers/staging/hv/netvsc_drv.c
index e87a7c205d85..51a56e2b43c1 100644
--- a/trunk/drivers/staging/hv/netvsc_drv.c
+++ b/trunk/drivers/staging/hv/netvsc_drv.c
@@ -294,7 +294,6 @@ static int netvsc_recv_callback(struct hv_device *device_obj,
 	struct net_device_context *net_device_ctx;
 	struct sk_buff *skb;
 	void *data;
-	int ret;
 	int i;
 	unsigned long flags;
 
@@ -308,12 +307,12 @@ static int netvsc_recv_callback(struct hv_device *device_obj,
 
 	net_device_ctx = netdev_priv(net);
 
-	/* Allocate a skb - TODO preallocate this */
-	/* Pad 2-bytes to align IP header to 16 bytes */
-	skb = dev_alloc_skb(packet->TotalDataBufferLength + 2);
-	ASSERT(skb);
-	skb_reserve(skb, 2);
-	skb->dev = net;
+	/* Allocate a skb - TODO direct I/O to pages? */
+	skb = netdev_alloc_skb_ip_align(net, packet->TotalDataBufferLength);
+	if (unlikely(!skb)) {
+		++net->stats.rx_dropped;
+		return 0;
+	}
 
 	/* for kmap_atomic */
 	local_irq_save(flags);
@@ -338,25 +337,18 @@ static int netvsc_recv_callback(struct hv_device *device_obj,
 	local_irq_restore(flags);
 
 	skb->protocol = eth_type_trans(skb, net);
-
 	skb->ip_summed = CHECKSUM_NONE;
 
+	net->stats.rx_packets++;
+	net->stats.rx_bytes += skb->len;
+
 	/*
 	 * Pass the skb back up. Network stack will deallocate the skb when it
-	 * is done
+	 * is done.
+	 * TODO - use NAPI?
 	 */
-	ret = netif_rx(skb);
-
-	switch (ret) {
-	case NET_RX_DROP:
-		net->stats.rx_dropped++;
-		break;
-	default:
-		net->stats.rx_packets++;
-		net->stats.rx_bytes += skb->len;
-		break;
+	netif_rx(skb);
 
-	}
 	DPRINT_DBG(NETVSC_DRV, "# of recvs %lu total size %lu",
 		   net->stats.rx_packets, net->stats.rx_bytes);