From 21c1506aa55437b270f57228ea3b39078b3cbda9 Mon Sep 17 00:00:00 2001
From: Haiyang Zhang <haiyangz@microsoft.com>
Date: Tue, 2 Oct 2012 05:30:22 +0000
Subject: [PATCH] --- yaml --- r: 328433 b: refs/heads/master c:
 6562640bd3b368a7ffb1caa61c82abe6e9d54b3b h: refs/heads/master i:   328431:
 5ab4a8885298ab8d464b1455eacf8f9af58bf2c6 v: v3

---
 [refs]                                | 2 +-
 trunk/drivers/net/hyperv/hyperv_net.h | 2 --
 trunk/drivers/net/hyperv/netvsc.c     | 4 +---
 3 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index 7c08c7b811cc..eb1c6237b48f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 99e3fcfa34e7ea6dbb44fe5df51b79ccb6f73d3d
+refs/heads/master: 6562640bd3b368a7ffb1caa61c82abe6e9d54b3b
diff --git a/trunk/drivers/net/hyperv/hyperv_net.h b/trunk/drivers/net/hyperv/hyperv_net.h
index 95ceb3593043..d58f28c46386 100644
--- a/trunk/drivers/net/hyperv/hyperv_net.h
+++ b/trunk/drivers/net/hyperv/hyperv_net.h
@@ -465,8 +465,6 @@ struct nvsp_message {
 
 #define NETVSC_RECEIVE_BUFFER_ID		0xcafe
 
-#define NETVSC_RECEIVE_SG_COUNT			1
-
 /* Preallocated receive packets */
 #define NETVSC_RECEIVE_PACKETLIST_COUNT		256
 
diff --git a/trunk/drivers/net/hyperv/netvsc.c b/trunk/drivers/net/hyperv/netvsc.c
index 4a1a5f58fa73..d9c4c0399c88 100644
--- a/trunk/drivers/net/hyperv/netvsc.c
+++ b/trunk/drivers/net/hyperv/netvsc.c
@@ -904,9 +904,7 @@ int netvsc_device_add(struct hv_device *device, void *additional_info)
 	INIT_LIST_HEAD(&net_device->recv_pkt_list);
 
 	for (i = 0; i < NETVSC_RECEIVE_PACKETLIST_COUNT; i++) {
-		packet = kzalloc(sizeof(struct hv_netvsc_packet) +
-				 (NETVSC_RECEIVE_SG_COUNT *
-				  sizeof(struct hv_page_buffer)), GFP_KERNEL);
+		packet = kzalloc(sizeof(struct hv_netvsc_packet), GFP_KERNEL);
 		if (!packet)
 			break;