Staging: hv: netvsc: Include the contents of netvsc_api.h into hyperv_net.h
authorK. Y. Srinivasan <kys@microsoft.com>
Fri, 13 May 2011 02:34:38 +0000 (19:34 -0700)
committerGreg Kroah-Hartman <gregkh@suse.de>
Tue, 17 May 2011 19:27:07 +0000 (12:27 -0700)
Include the contents of netvsc_api.h into hyperv_net.h.

Signed-off-by: K. Y. Srinivasan <kys@microsoft.com>
Signed-off-by: Haiyang Zhang <haiyangz@microsoft.com>
Signed-off-by: Abhishek Kane <v-abkane@microsoft.com>
Signed-off-by: Hank Janssen <hjanssen@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
drivers/staging/hv/hyperv_net.h
drivers/staging/hv/netvsc.h
drivers/staging/hv/netvsc_api.h [deleted file]
drivers/staging/hv/netvsc_drv.c
drivers/staging/hv/rndis_filter.c

index 9eb5c86..1cd5602 100644 (file)
 #ifndef _HYPERV_NET_H
 #define _HYPERV_NET_H
 
+#include "hyperv.h"
+
+/* Fwd declaration */
+struct hv_netvsc_packet;
+
+/* Represent the xfer page packet which contains 1 or more netvsc packet */
+struct xferpage_packet {
+       struct list_head list_ent;
+
+       /* # 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 */
+       struct list_head list_ent;
+
+       struct hv_device *device;
+       bool is_data_pkt;
+
+       /*
+        * Valid only for receives when we break a xfer page packet
+        * into multiple netvsc packets
+        */
+       struct xferpage_packet *xfer_page_pkt;
+
+       union {
+               struct {
+                       u64 recv_completion_tid;
+                       void *recv_completion_ctx;
+                       void (*recv_completion)(void *context);
+               } recv;
+               struct {
+                       u64 send_completion_tid;
+                       void *send_completion_ctx;
+                       void (*send_completion)(void *context);
+               } send;
+       } completion;
+
+       /* This points to the memory after page_buf */
+       void *extension;
+
+       u32 total_data_buflen;
+       /* Points to the send/receive buffer where the ethernet frame is */
+       u32 page_buf_cnt;
+       struct hv_page_buffer page_buf[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 ring_buf_size;
+       u32 req_ext_size;
+
+       /*
+        * This is set by the caller to allow us to callback when we
+        * receive a packet from the "wire"
+        */
+       int (*recv_cb)(struct hv_device *dev,
+                                struct hv_netvsc_packet *packet);
+       void (*link_status_change)(struct hv_device *dev, u32 status);
+
+       /* Specific to this driver */
+       int (*send)(struct hv_device *dev, struct hv_netvsc_packet *packet);
+
+       void *ctx;
+};
+
+static inline
+struct netvsc_driver *drv_to_netvscdrv(struct device_driver *d)
+{
+       struct hv_driver *hvdrv = drv_to_hv_drv(d);
+       return container_of(hvdrv, struct netvsc_driver, base);
+}
+
+struct netvsc_device_info {
+       unsigned char mac_adr[6];
+       bool link_state;        /* 0 - link up, 1 - link down */
+};
+
+/* Interface */
+int netvsc_device_add(struct hv_device *device, void *additional_info);
+int netvsc_device_remove(struct hv_device *device);
+int netvsc_initialize(struct hv_driver *drv);
+int rndis_filter_open(struct hv_device *dev);
+int rndis_filter_close(struct hv_device *dev);
+int rndis_filte_device_add(struct hv_device *dev,
+                       void *additional_info);
+int rndis_filter_device_remove(struct hv_device *dev);
+
+
 #endif /* _HYPERV_NET_H */
index 76fce46..c6ddf6c 100644 (file)
@@ -27,7 +27,6 @@
 
 #include <linux/list.h>
 #include "hyperv.h"
-#include "netvsc_api.h"
 
 
 #define NVSP_INVALID_PROTOCOL_VERSION  ((u32)0xFFFFFFFF)
diff --git a/drivers/staging/hv/netvsc_api.h b/drivers/staging/hv/netvsc_api.h
deleted file mode 100644 (file)
index ce4c8d2..0000000
+++ /dev/null
@@ -1,129 +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 <haiyangz@microsoft.com>
- *   Hank Janssen  <hjanssen@microsoft.com>
- *
- */
-
-
-#ifndef _NETVSC_API_H_
-#define _NETVSC_API_H_
-
-#include "hyperv.h"
-
-/* Fwd declaration */
-struct hv_netvsc_packet;
-
-/* Represent the xfer page packet which contains 1 or more netvsc packet */
-struct xferpage_packet {
-       struct list_head list_ent;
-
-       /* # 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 */
-       struct list_head list_ent;
-
-       struct hv_device *device;
-       bool is_data_pkt;
-
-       /*
-        * Valid only for receives when we break a xfer page packet
-        * into multiple netvsc packets
-        */
-       struct xferpage_packet *xfer_page_pkt;
-
-       union {
-               struct{
-                       u64 recv_completion_tid;
-                       void *recv_completion_ctx;
-                       void (*recv_completion)(void *context);
-               } recv;
-               struct{
-                       u64 send_completion_tid;
-                       void *send_completion_ctx;
-                       void (*send_completion)(void *context);
-               } send;
-       } completion;
-
-       /* This points to the memory after page_buf */
-       void *extension;
-
-       u32 total_data_buflen;
-       /* Points to the send/receive buffer where the ethernet frame is */
-       u32 page_buf_cnt;
-       struct hv_page_buffer page_buf[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 ring_buf_size;
-       u32 req_ext_size;
-
-       /*
-        * This is set by the caller to allow us to callback when we
-        * receive a packet from the "wire"
-        */
-       int (*recv_cb)(struct hv_device *dev,
-                                struct hv_netvsc_packet *packet);
-       void (*link_status_change)(struct hv_device *dev, u32 status);
-
-       /* Specific to this driver */
-       int (*send)(struct hv_device *dev, struct hv_netvsc_packet *packet);
-
-       void *ctx;
-};
-
-static inline
-struct netvsc_driver *drv_to_netvscdrv(struct device_driver *d)
-{
-       struct hv_driver *hvdrv = drv_to_hv_drv(d);
-       return container_of(hvdrv, struct netvsc_driver, base);
-}
-
-struct netvsc_device_info {
-       unsigned char mac_adr[6];
-       bool link_state;        /* 0 - link up, 1 - link down */
-};
-
-/* Interface */
-int netvsc_device_add(struct hv_device *device, void *additional_info);
-int netvsc_device_remove(struct hv_device *device);
-int netvsc_initialize(struct hv_driver *drv);
-int rndis_filter_open(struct hv_device *dev);
-int rndis_filter_close(struct hv_device *dev);
-int rndis_filte_device_add(struct hv_device *dev,
-                       void *additional_info);
-int rndis_filter_device_remove(struct hv_device *dev);
-
-
-#endif /* _NETVSC_API_H_ */
index 06fc9d1..ced3802 100644 (file)
@@ -41,7 +41,6 @@
 
 #include "hyperv.h"
 #include "hyperv_net.h"
-#include "netvsc_api.h"
 
 struct net_device_context {
        /* point back to our device context */
index 74bd4b1..26658c6 100644 (file)
@@ -29,7 +29,6 @@
 
 #include "hyperv.h"
 #include "hyperv_net.h"
-#include "netvsc_api.h"
 #include "rndis_filter.h"
 
 /* Data types */