From 35733c1c3488f2e034c4065bd01b39cd66c239c5 Mon Sep 17 00:00:00 2001 From: "K. Y. Srinivasan" Date: Thu, 12 May 2011 19:34:51 -0700 Subject: [PATCH] --- yaml --- r: 249679 b: refs/heads/master c: f79adf8f135a6dead5967a7266bd894e8f293529 h: refs/heads/master i: 249677: 876e14de353ec5a41eff84ac23a536e40a0d47c0 249675: 56754f4e867f9704f44ea3d3bf8a12f27f4aa87d 249671: b25b3f1fc862014260081de1e51e0c51167c81ff 249663: 6234927554c21a4d37965e960d4f9c4a9daa8d53 v: v3 --- [refs] | 2 +- trunk/drivers/staging/hv/hyperv_net.h | 2 ++ trunk/drivers/staging/hv/netvsc_drv.c | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 166f02958d4d..daf216c8a862 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 90ef117a30b64dd37b735bfbacbc5ae014a9f74f +refs/heads/master: f79adf8f135a6dead5967a7266bd894e8f293529 diff --git a/trunk/drivers/staging/hv/hyperv_net.h b/trunk/drivers/staging/hv/hyperv_net.h index 967ef2818fa6..92b56dce1961 100644 --- a/trunk/drivers/staging/hv/hyperv_net.h +++ b/trunk/drivers/staging/hv/hyperv_net.h @@ -122,6 +122,8 @@ int netvsc_send(struct hv_device *device, struct hv_netvsc_packet *packet); void netvsc_linkstatus_callback(struct hv_device *device_obj, unsigned int status); +int netvsc_recv_callback(struct hv_device *device_obj, + struct hv_netvsc_packet *packet); int netvsc_initialize(struct hv_driver *drv); int rndis_filter_open(struct hv_device *dev); int rndis_filter_close(struct hv_device *dev); diff --git a/trunk/drivers/staging/hv/netvsc_drv.c b/trunk/drivers/staging/hv/netvsc_drv.c index e2da7fed7e83..a55538a5a32a 100644 --- a/trunk/drivers/staging/hv/netvsc_drv.c +++ b/trunk/drivers/staging/hv/netvsc_drv.c @@ -233,7 +233,7 @@ void netvsc_linkstatus_callback(struct hv_device *device_obj, * netvsc_recv_callback - Callback when we receive a packet from the * "wire" on the specified device. */ -static int netvsc_recv_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);