From 9b95abe248fa3b18ec849a0f52a9fa0c819c1928 Mon Sep 17 00:00:00 2001 From: Haiyang Zhang Date: Sun, 5 Feb 2012 12:13:09 +0000 Subject: [PATCH] --- yaml --- r: 289897 b: refs/heads/master c: 6f4c44460750dd4eb9926a58ab1ad0ceacef8284 h: refs/heads/master i: 289895: 3679ec1eb7d9b25387f3c6db43b8fb895c09fd43 v: v3 --- [refs] | 2 +- trunk/drivers/net/hyperv/netvsc_drv.c | 7 ++----- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 9ec0e20c3443..119fcb1b6365 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5fccab3b66d53883a97fc65e0c33f3ebf74e8ff9 +refs/heads/master: 6f4c44460750dd4eb9926a58ab1ad0ceacef8284 diff --git a/trunk/drivers/net/hyperv/netvsc_drv.c b/trunk/drivers/net/hyperv/netvsc_drv.c index 466c58a7353d..0ae7a1a6aeb0 100644 --- a/trunk/drivers/net/hyperv/netvsc_drv.c +++ b/trunk/drivers/net/hyperv/netvsc_drv.c @@ -267,13 +267,10 @@ void netvsc_linkstatus_callback(struct hv_device *device_obj, int netvsc_recv_callback(struct hv_device *device_obj, struct hv_netvsc_packet *packet) { - struct net_device *net = dev_get_drvdata(&device_obj->device); + struct net_device *net; struct sk_buff *skb; - struct netvsc_device *net_device; - - net_device = hv_get_drvdata(device_obj); - net = net_device->ndev; + net = ((struct netvsc_device *)hv_get_drvdata(device_obj))->ndev; if (!net) { netdev_err(net, "got receive callback but net device" " not initialized yet\n");