From 05be7a3a20ffd6f3beac1b810f385e346b78eb5f Mon Sep 17 00:00:00 2001 From: "K. Y. Srinivasan" Date: Thu, 12 May 2011 19:35:01 -0700 Subject: [PATCH] --- yaml --- r: 249689 b: refs/heads/master c: f8ba8c7050d1d08d6f06a6a762d7b4e75f4bb56d h: refs/heads/master i: 249687: 8bcaefe9ddf5b1aab7a95f840b5006244c9e6e0f v: v3 --- [refs] | 2 +- trunk/drivers/staging/hv/netvsc_drv.c | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 0f70a06620c2..127305b57b61 100644 --- 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 index cade6e68335e..1b9820289175 100644 --- 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");