From cc21181217549e0a894dd6b57feacbcb979d831b Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Fri, 28 Aug 2009 16:23:17 -0700 Subject: Staging: hv: move NetVscApi.h Move it out of the include subdirectory. No code changes here, just file movements. Cc: Hank Janssen Signed-off-by: Greg Kroah-Hartman --- drivers/staging/hv/NetVsc.h | 2 +- drivers/staging/hv/NetVscApi.h | 140 +++++++++++++++++++++++++++++++++ drivers/staging/hv/RndisFilter.c | 2 +- drivers/staging/hv/include/NetVscApi.h | 140 --------------------------------- drivers/staging/hv/netvsc_drv.c | 2 +- 5 files changed, 143 insertions(+), 143 deletions(-) create mode 100644 drivers/staging/hv/NetVscApi.h delete mode 100644 drivers/staging/hv/include/NetVscApi.h (limited to 'drivers') diff --git a/drivers/staging/hv/NetVsc.h b/drivers/staging/hv/NetVsc.h index 93734400fc9..afa764f13ac 100644 --- a/drivers/staging/hv/NetVsc.h +++ b/drivers/staging/hv/NetVsc.h @@ -27,7 +27,7 @@ #include "include/VmbusPacketFormat.h" #include "include/VmbusChannelInterface.h" #include "List.h" -#include "include/NetVscApi.h" +#include "NetVscApi.h" #define NVSP_INVALID_PROTOCOL_VERSION ((u32)0xFFFFFFFF) diff --git a/drivers/staging/hv/NetVscApi.h b/drivers/staging/hv/NetVscApi.h new file mode 100644 index 00000000000..9166c5c80f1 --- /dev/null +++ b/drivers/staging/hv/NetVscApi.h @@ -0,0 +1,140 @@ +/* + * + * Copyright (c) 2009, Microsoft Corporation. + * + * This program is free software; you can redistribute it and/or modify it + * under the terms and conditions of the GNU General Public License, + * version 2, as published by the Free Software Foundation. + * + * This program is distributed in the hope it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for + * more details. + * + * You should have received a copy of the GNU General Public License along with + * this program; if not, write to the Free Software Foundation, Inc., 59 Temple + * Place - Suite 330, Boston, MA 02111-1307 USA. + * + * Authors: + * Haiyang Zhang + * Hank Janssen + * + */ + + +#ifndef _NETVSC_API_H_ +#define _NETVSC_API_H_ + +#include "include/VmbusApi.h" +#include "List.h" + +/* Defines */ +#define NETVSC_DEVICE_RING_BUFFER_SIZE (64*PAGE_SIZE) +#define HW_MACADDR_LEN 6 + +/* Fwd declaration */ +struct hv_netvsc_packet; + +/* Data types */ +typedef int (*PFN_ON_OPEN)(struct hv_device *Device); +typedef int (*PFN_ON_CLOSE)(struct hv_device *Device); + +typedef void (*PFN_QUERY_LINKSTATUS)(struct hv_device *Device); +typedef int (*PFN_ON_SEND)(struct hv_device *dev, + struct hv_netvsc_packet *packet); +typedef void (*PFN_ON_SENDRECVCOMPLETION)(void *Context); + +typedef int (*PFN_ON_RECVCALLBACK)(struct hv_device *dev, + struct hv_netvsc_packet *packet); +typedef void (*PFN_ON_LINKSTATUS_CHANGED)(struct hv_device *dev, u32 Status); + +/* Represent the xfer page packet which contains 1 or more netvsc packet */ +struct xferpage_packet { + LIST_ENTRY ListEntry; + + /* # of netvsc packets this xfer packet contains */ + u32 Count; +}; + +/* The number of pages which are enough to cover jumbo frame buffer. */ +#define NETVSC_PACKET_MAXPAGE 4 + +/* + * Represent netvsc packet which contains 1 RNDIS and 1 ethernet frame + * within the RNDIS + */ +struct hv_netvsc_packet { + /* Bookkeeping stuff */ + LIST_ENTRY ListEntry; + + struct hv_device *Device; + bool IsDataPacket; + + /* + * Valid only for receives when we break a xfer page packet + * into multiple netvsc packets + */ + struct xferpage_packet *XferPagePacket; + + union { + struct{ + u64 ReceiveCompletionTid; + void *ReceiveCompletionContext; + PFN_ON_SENDRECVCOMPLETION OnReceiveCompletion; + } Recv; + struct{ + u64 SendCompletionTid; + void *SendCompletionContext; + PFN_ON_SENDRECVCOMPLETION OnSendCompletion; + } Send; + } Completion; + + /* This points to the memory after PageBuffers */ + void *Extension; + + u32 TotalDataBufferLength; + /* Points to the send/receive buffer where the ethernet frame is */ + u32 PageBufferCount; + struct hv_page_buffer PageBuffers[NETVSC_PACKET_MAXPAGE]; +}; + +/* Represents the net vsc driver */ +struct netvsc_driver { + /* Must be the first field */ + /* Which is a bug FIXME! */ + struct hv_driver Base; + + u32 RingBufferSize; + u32 RequestExtSize; + + /* Additional num of page buffers to allocate */ + u32 AdditionalRequestPageBufferCount; + + /* + * This is set by the caller to allow us to callback when we + * receive a packet from the "wire" + */ + PFN_ON_RECVCALLBACK OnReceiveCallback; + + PFN_ON_LINKSTATUS_CHANGED OnLinkStatusChanged; + + /* Specific to this driver */ + PFN_ON_OPEN OnOpen; + PFN_ON_CLOSE OnClose; + PFN_ON_SEND OnSend; + /* PFN_ON_RECVCOMPLETION OnReceiveCompletion; */ + + /* PFN_QUERY_LINKSTATUS QueryLinkStatus; */ + + void *Context; +}; + +struct netvsc_device_info { + unsigned char MacAddr[6]; + bool LinkState; /* 0 - link up, 1 - link down */ +}; + +/* Interface */ +int NetVscInitialize(struct hv_driver *drv); + +#endif /* _NETVSC_API_H_ */ diff --git a/drivers/staging/hv/RndisFilter.c b/drivers/staging/hv/RndisFilter.c index 1c2f15799d3..a509cb34ce6 100644 --- a/drivers/staging/hv/RndisFilter.c +++ b/drivers/staging/hv/RndisFilter.c @@ -28,7 +28,7 @@ #include "osd.h" #include "logging.h" -#include "include/NetVscApi.h" +#include "NetVscApi.h" #include "RndisFilter.h" diff --git a/drivers/staging/hv/include/NetVscApi.h b/drivers/staging/hv/include/NetVscApi.h deleted file mode 100644 index 5075494eefa..00000000000 --- a/drivers/staging/hv/include/NetVscApi.h +++ /dev/null @@ -1,140 +0,0 @@ -/* - * - * Copyright (c) 2009, Microsoft Corporation. - * - * This program is free software; you can redistribute it and/or modify it - * under the terms and conditions of the GNU General Public License, - * version 2, as published by the Free Software Foundation. - * - * This program is distributed in the hope it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for - * more details. - * - * You should have received a copy of the GNU General Public License along with - * this program; if not, write to the Free Software Foundation, Inc., 59 Temple - * Place - Suite 330, Boston, MA 02111-1307 USA. - * - * Authors: - * Haiyang Zhang - * Hank Janssen - * - */ - - -#ifndef _NETVSC_API_H_ -#define _NETVSC_API_H_ - -#include "VmbusApi.h" -#include "../List.h" - -/* Defines */ -#define NETVSC_DEVICE_RING_BUFFER_SIZE (64*PAGE_SIZE) -#define HW_MACADDR_LEN 6 - -/* Fwd declaration */ -struct hv_netvsc_packet; - -/* Data types */ -typedef int (*PFN_ON_OPEN)(struct hv_device *Device); -typedef int (*PFN_ON_CLOSE)(struct hv_device *Device); - -typedef void (*PFN_QUERY_LINKSTATUS)(struct hv_device *Device); -typedef int (*PFN_ON_SEND)(struct hv_device *dev, - struct hv_netvsc_packet *packet); -typedef void (*PFN_ON_SENDRECVCOMPLETION)(void *Context); - -typedef int (*PFN_ON_RECVCALLBACK)(struct hv_device *dev, - struct hv_netvsc_packet *packet); -typedef void (*PFN_ON_LINKSTATUS_CHANGED)(struct hv_device *dev, u32 Status); - -/* Represent the xfer page packet which contains 1 or more netvsc packet */ -struct xferpage_packet { - LIST_ENTRY ListEntry; - - /* # of netvsc packets this xfer packet contains */ - u32 Count; -}; - -/* The number of pages which are enough to cover jumbo frame buffer. */ -#define NETVSC_PACKET_MAXPAGE 4 - -/* - * Represent netvsc packet which contains 1 RNDIS and 1 ethernet frame - * within the RNDIS - */ -struct hv_netvsc_packet { - /* Bookkeeping stuff */ - LIST_ENTRY ListEntry; - - struct hv_device *Device; - bool IsDataPacket; - - /* - * Valid only for receives when we break a xfer page packet - * into multiple netvsc packets - */ - struct xferpage_packet *XferPagePacket; - - union { - struct{ - u64 ReceiveCompletionTid; - void *ReceiveCompletionContext; - PFN_ON_SENDRECVCOMPLETION OnReceiveCompletion; - } Recv; - struct{ - u64 SendCompletionTid; - void *SendCompletionContext; - PFN_ON_SENDRECVCOMPLETION OnSendCompletion; - } Send; - } Completion; - - /* This points to the memory after PageBuffers */ - void *Extension; - - u32 TotalDataBufferLength; - /* Points to the send/receive buffer where the ethernet frame is */ - u32 PageBufferCount; - struct hv_page_buffer PageBuffers[NETVSC_PACKET_MAXPAGE]; -}; - -/* Represents the net vsc driver */ -struct netvsc_driver { - /* Must be the first field */ - /* Which is a bug FIXME! */ - struct hv_driver Base; - - u32 RingBufferSize; - u32 RequestExtSize; - - /* Additional num of page buffers to allocate */ - u32 AdditionalRequestPageBufferCount; - - /* - * This is set by the caller to allow us to callback when we - * receive a packet from the "wire" - */ - PFN_ON_RECVCALLBACK OnReceiveCallback; - - PFN_ON_LINKSTATUS_CHANGED OnLinkStatusChanged; - - /* Specific to this driver */ - PFN_ON_OPEN OnOpen; - PFN_ON_CLOSE OnClose; - PFN_ON_SEND OnSend; - /* PFN_ON_RECVCOMPLETION OnReceiveCompletion; */ - - /* PFN_QUERY_LINKSTATUS QueryLinkStatus; */ - - void *Context; -}; - -struct netvsc_device_info { - unsigned char MacAddr[6]; - bool LinkState; /* 0 - link up, 1 - link down */ -}; - -/* Interface */ -int NetVscInitialize(struct hv_driver *drv); - -#endif /* _NETVSC_API_H_ */ diff --git a/drivers/staging/hv/netvsc_drv.c b/drivers/staging/hv/netvsc_drv.c index f10a0cf43f3..bec135bc704 100644 --- a/drivers/staging/hv/netvsc_drv.c +++ b/drivers/staging/hv/netvsc_drv.c @@ -40,7 +40,7 @@ #include "logging.h" #include "vmbus.h" -#include "include/NetVscApi.h" +#include "NetVscApi.h" MODULE_LICENSE("GPL"); -- cgit v1.2.3