---

yaml --- r: 249669 b: refs/heads/master c: 299d092 h: refs/heads/master i: 249667: 83f0193 v: v3
git-mirror · May 17, 2011 · 912f9ad · 912f9ad
1 parent eefa619
commit 912f9ad
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 56 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4a5cea3951c79dc6590207fcfb09cc062374c42c
+refs/heads/master: 299d0925e2c5fc27e538b721561c8bf649c6dc05
diff --git a/trunk/drivers/staging/hv/hyperv_net.h b/trunk/drivers/staging/hv/hyperv_net.h
@@ -1055,4 +1055,30 @@ struct rndis_message {
 #define RNDIS_MESSAGE_RAW_PTR_TO_MESSAGE_PTR(rndis_msg)	\
 	((void *) rndis_msg)
 
+
+#define __struct_bcount(x)
+
+
+
+#define RNDIS_HEADER_SIZE	(sizeof(struct rndis_message) - \
+				 sizeof(union rndis_message_container))
+
+#define NDIS_PACKET_TYPE_DIRECTED	0x00000001
+#define NDIS_PACKET_TYPE_MULTICAST	0x00000002
+#define NDIS_PACKET_TYPE_ALL_MULTICAST	0x00000004
+#define NDIS_PACKET_TYPE_BROADCAST	0x00000008
+#define NDIS_PACKET_TYPE_SOURCE_ROUTING	0x00000010
+#define NDIS_PACKET_TYPE_PROMISCUOUS	0x00000020
+#define NDIS_PACKET_TYPE_SMT		0x00000040
+#define NDIS_PACKET_TYPE_ALL_LOCAL	0x00000080
+#define NDIS_PACKET_TYPE_GROUP		0x00000100
+#define NDIS_PACKET_TYPE_ALL_FUNCTIONAL	0x00000200
+#define NDIS_PACKET_TYPE_FUNCTIONAL	0x00000400
+#define NDIS_PACKET_TYPE_MAC_FRAME	0x00000800
+
+
+/* Interface */
+
+extern int rndis_filter_init(struct netvsc_driver *driver);
+
 #endif /* _HYPERV_NET_H */
diff --git a/trunk/drivers/staging/hv/netvsc.c b/trunk/drivers/staging/hv/netvsc.c
@@ -30,7 +30,6 @@
 
 #include "hyperv.h"
 #include "hyperv_net.h"
-#include "rndis_filter.h"
 
 
 /* Globals */

diff --git a/trunk/drivers/staging/hv/rndis_filter.c b/trunk/drivers/staging/hv/rndis_filter.c
@@ -29,7 +29,6 @@
 
 #include "hyperv.h"
 #include "hyperv_net.h"
-#include "rndis_filter.h"
 
 /* Data types */
 struct rndis_filter_driver_object {

diff --git a/trunk/drivers/staging/hv/rndis_filter.h b/trunk/drivers/staging/hv/rndis_filter.h