diff --git a/[refs] b/[refs] index 7637881d66dd..0f70a06620c2 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e3f8a80efbf8a857fd26b5154c66b3fb614e5bbd +refs/heads/master: 9dbfd1509e59b16bc83e0835f52e1b05a9e54212 diff --git a/trunk/drivers/staging/hv/hyperv_net.h b/trunk/drivers/staging/hv/hyperv_net.h index 03f37da46540..e43f9fafb8a4 100644 --- a/trunk/drivers/staging/hv/hyperv_net.h +++ b/trunk/drivers/staging/hv/hyperv_net.h @@ -1019,6 +1019,13 @@ struct rndis_message { union rndis_message_container msg; }; + +struct rndis_filter_packet { + void *completion_ctx; + void (*completion)(void *context); + struct rndis_message msg; +}; + /* Handy macros */ /* get the size of an RNDIS message. Pass in the message type, */ diff --git a/trunk/drivers/staging/hv/rndis_filter.c b/trunk/drivers/staging/hv/rndis_filter.c index ca922d8c2b9e..b67b772fdf92 100644 --- a/trunk/drivers/staging/hv/rndis_filter.c +++ b/trunk/drivers/staging/hv/rndis_filter.c @@ -74,14 +74,6 @@ struct rndis_request { struct rndis_message request_msg; }; - -struct rndis_filter_packet { - void *completion_ctx; - void (*completion)(void *context); - struct rndis_message msg; -}; - - static void rndis_filter_send_completion(void *ctx); static void rndis_filter_send_request_completion(void *ctx);