From 751ebb1595ee4c294e5af9b58618358dd44536f5 Mon Sep 17 00:00:00 2001
From: Greg Kroah-Hartman <gregkh@suse.de>
Date: Fri, 8 Jan 2010 10:24:42 -0800
Subject: [PATCH] --- yaml --- r: 186591 b: refs/heads/master c:
 2d0753464b497287565c2e54d3ae67666852ef57 h: refs/heads/master i:   186589:
 84fc8abdb6492682ab0ff21444dd49ab7b968157   186587:
 5e8f4a80d6e49fefb83e0e81a61dfecaee29e8da   186583:
 4651e501055f35c6724ec307b9d135f070bb5840   186575:
 411b4255fd1fc4cf65b8bc7daebf6286042f9ecf   186559:
 68f0d19f505d306382bedaa1c5e14c9916f4db81 v: v3

---
 [refs]                                 | 2 +-
 trunk/drivers/staging/hv/NetVscApi.h   | 2 +-
 trunk/drivers/staging/hv/RndisFilter.c | 5 +----
 trunk/drivers/staging/hv/netvsc_drv.c  | 7 +------
 4 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/[refs] b/[refs]
index 316030ecc7b5..0c8104145158 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 354b0a643e89dd3163278c9a0ac9cbcb9ef5c298
+refs/heads/master: 2d0753464b497287565c2e54d3ae67666852ef57
diff --git a/trunk/drivers/staging/hv/NetVscApi.h b/trunk/drivers/staging/hv/NetVscApi.h
index 1ce2b74a34a7..93b9226ff3b5 100644
--- a/trunk/drivers/staging/hv/NetVscApi.h
+++ b/trunk/drivers/staging/hv/NetVscApi.h
@@ -105,7 +105,6 @@ struct netvsc_driver {
 	void (*OnLinkStatusChanged)(struct hv_device *dev, u32 Status);
 
 	/* Specific to this driver */
-	int (*OnOpen)(struct hv_device *dev);
 	int (*OnClose)(struct hv_device *dev);
 	int (*OnSend)(struct hv_device *dev, struct hv_netvsc_packet *packet);
 
@@ -119,5 +118,6 @@ struct netvsc_device_info {
 
 /* Interface */
 int NetVscInitialize(struct hv_driver *drv);
+int RndisFilterOnOpen(struct hv_device *Device);
 
 #endif /* _NETVSC_API_H_ */
diff --git a/trunk/drivers/staging/hv/RndisFilter.c b/trunk/drivers/staging/hv/RndisFilter.c
index 26d79975387c..74f741eb1296 100644
--- a/trunk/drivers/staging/hv/RndisFilter.c
+++ b/trunk/drivers/staging/hv/RndisFilter.c
@@ -85,8 +85,6 @@ static int RndisFilterOnDeviceRemove(struct hv_device *Device);
 
 static void RndisFilterOnCleanup(struct hv_driver *Driver);
 
-static int RndisFilterOnOpen(struct hv_device *Device);
-
 static int RndisFilterOnClose(struct hv_device *Device);
 
 static int RndisFilterOnSend(struct hv_device *Device,
@@ -654,7 +652,6 @@ int RndisFilterInit(struct netvsc_driver *Driver)
 	Driver->Base.OnDeviceRemove = RndisFilterOnDeviceRemove;
 	Driver->Base.OnCleanup = RndisFilterOnCleanup;
 	Driver->OnSend = RndisFilterOnSend;
-	Driver->OnOpen = RndisFilterOnOpen;
 	Driver->OnClose = RndisFilterOnClose;
 	/* Driver->QueryLinkStatus = RndisFilterQueryDeviceLinkStatus; */
 	Driver->OnReceiveCallback = RndisFilterOnReceive;
@@ -888,7 +885,7 @@ static void RndisFilterOnCleanup(struct hv_driver *Driver)
 	DPRINT_EXIT(NETVSC);
 }
 
-static int RndisFilterOnOpen(struct hv_device *Device)
+int RndisFilterOnOpen(struct hv_device *Device)
 {
 	int ret;
 	struct netvsc_device *netDevice = Device->Extension;
diff --git a/trunk/drivers/staging/hv/netvsc_drv.c b/trunk/drivers/staging/hv/netvsc_drv.c
index 0d7459e2d036..515cd2361bf2 100644
--- a/trunk/drivers/staging/hv/netvsc_drv.c
+++ b/trunk/drivers/staging/hv/netvsc_drv.c
@@ -72,11 +72,6 @@ static void netvsc_set_multicast_list(struct net_device *net)
 static int netvsc_open(struct net_device *net)
 {
 	struct net_device_context *net_device_ctx = netdev_priv(net);
-	struct driver_context *driver_ctx =
-	    driver_to_driver_context(net_device_ctx->device_ctx->device.driver);
-	struct netvsc_driver_context *net_drv_ctx =
-		(struct netvsc_driver_context *)driver_ctx;
-	struct netvsc_driver *net_drv_obj = &net_drv_ctx->drv_obj;
 	struct hv_device *device_obj = &net_device_ctx->device_ctx->device_obj;
 	int ret = 0;
 
@@ -87,7 +82,7 @@ static int netvsc_open(struct net_device *net)
 		       sizeof(struct net_device_stats));
 
 		/* Open up the device */
-		ret = net_drv_obj->OnOpen(device_obj);
+		ret = RndisFilterOnOpen(device_obj);
 		if (ret != 0) {
 			DPRINT_ERR(NETVSC_DRV,
 				   "unable to open device (ret %d).", ret);