---

yaml --- r: 249689 b: refs/heads/master c: f8ba8c7 h: refs/heads/master i: 249687: 8bcaefe v: v3
git-mirror · May 17, 2011 · 05be7a3 · 05be7a3
1 parent f300465
commit 05be7a3
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9dbfd1509e59b16bc83e0835f52e1b05a9e54212
+refs/heads/master: f8ba8c7050d1d08d6f06a6a762d7b4e75f4bb56d
diff --git a/trunk/drivers/staging/hv/netvsc_drv.c b/trunk/drivers/staging/hv/netvsc_drv.c
@@ -127,8 +127,6 @@ static void netvsc_xmit_completion(void *context)
 static int netvsc_start_xmit(struct sk_buff *skb, struct net_device *net)
 {
 	struct net_device_context *net_device_ctx = netdev_priv(net);
-	struct netvsc_driver *net_drv_obj =
-		drv_to_netvscdrv(net_device_ctx->device_ctx->device.driver);
 	struct hv_netvsc_packet *packet;
 	int ret;
 	unsigned int i, num_pages;
@@ -141,7 +139,7 @@ static int netvsc_start_xmit(struct sk_buff *skb, struct net_device *net)
 	/* Allocate a netvsc packet based on # of frags. */
 	packet = kzalloc(sizeof(struct hv_netvsc_packet) +
 			 (num_pages * sizeof(struct hv_page_buffer)) +
-			 net_drv_obj->req_ext_size, GFP_ATOMIC);
+			 sizeof(struct rndis_filter_packet), GFP_ATOMIC);
 	if (!packet) {
 		/* out of memory, silently drop packet */
 		netdev_err(net, "unable to allocate hv_netvsc_packet\n");