---

yaml --- r: 281174 b: refs/heads/master c: 95fa040 h: refs/heads/master v: v3
git-mirror · Nov 29, 2011 · 306f967 · 306f967
1 parent 3cc5c63
commit 306f967
Show file tree

Hide file tree

Showing 12 changed files with 13 additions and 10 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3b724ca14565747926c23af1fa1afb1848c3f448
+refs/heads/master: 95fa0405c5991726e06c08ffcd8ff872f7fb4f2d
diff --git a/trunk/drivers/net/Kconfig b/trunk/drivers/net/Kconfig
@@ -338,4 +338,6 @@ config VMXNET3
 	  To compile this driver as a module, choose M here: the
 	  module will be called vmxnet3.
 
+source "drivers/net/hyperv/Kconfig"
+
 endif # NETDEVICES
diff --git a/trunk/drivers/net/Makefile b/trunk/drivers/net/Makefile
@@ -66,3 +66,5 @@ obj-$(CONFIG_USB_USBNET)        += usb/
 obj-$(CONFIG_USB_ZD1201)        += usb/
 obj-$(CONFIG_USB_IPHETH)        += usb/
 obj-$(CONFIG_USB_CDC_PHONET)   += usb/
+
+obj-$(CONFIG_HYPERV_NET) += hyperv/
diff --git a/trunk/drivers/net/hyperv/Kconfig b/trunk/drivers/net/hyperv/Kconfig
@@ -0,0 +1,5 @@
+config HYPERV_NET
+	tristate "Microsoft Hyper-V virtual network driver"
+	depends on HYPERV
+	help
+	  Select this option to enable the Hyper-V virtual network driver.
diff --git a/trunk/drivers/net/hyperv/Makefile b/trunk/drivers/net/hyperv/Makefile
@@ -0,0 +1,3 @@
+obj-$(CONFIG_HYPERV_NET) += hv_netvsc.o
+
+hv_netvsc-y := netvsc_drv.o netvsc.o rndis_filter.o
diff --git a/trunk/drivers/staging/hv/hyperv_net.h → trunk/drivers/net/hyperv/hyperv_net.h b/trunk/drivers/staging/hv/hyperv_net.h → trunk/drivers/net/hyperv/hyperv_net.h
diff --git a/trunk/drivers/staging/hv/netvsc.c → trunk/drivers/net/hyperv/netvsc.c b/trunk/drivers/staging/hv/netvsc.c → trunk/drivers/net/hyperv/netvsc.c
diff --git a/trunk/drivers/staging/hv/netvsc_drv.c → trunk/drivers/net/hyperv/netvsc_drv.c b/trunk/drivers/staging/hv/netvsc_drv.c → trunk/drivers/net/hyperv/netvsc_drv.c
diff --git a/trunk/drivers/staging/hv/rndis_filter.c → trunk/drivers/net/hyperv/rndis_filter.c b/trunk/drivers/staging/hv/rndis_filter.c → trunk/drivers/net/hyperv/rndis_filter.c
diff --git a/trunk/drivers/staging/hv/Kconfig b/trunk/drivers/staging/hv/Kconfig
@@ -4,12 +4,6 @@ config HYPERV_STORAGE
 	help
 	 Select this option to enable the Hyper-V virtual storage driver.
 
-config HYPERV_NET
-	tristate "Microsoft Hyper-V virtual network driver"
-	depends on HYPERV && NET
-	help
-	  Select this option to enable the Hyper-V virtual network driver.
-
 config HYPERV_MOUSE
 	tristate "Microsoft Hyper-V mouse driver"
 	depends on HYPERV && HID

diff --git a/trunk/drivers/staging/hv/Makefile b/trunk/drivers/staging/hv/Makefile
@@ -1,6 +1,4 @@
 obj-$(CONFIG_HYPERV_STORAGE)	+= hv_storvsc.o
-obj-$(CONFIG_HYPERV_NET)	+= hv_netvsc.o
 obj-$(CONFIG_HYPERV_MOUSE)	+= hv_mouse.o
 
 hv_storvsc-y := storvsc_drv.o
-hv_netvsc-y := netvsc_drv.o netvsc.o rndis_filter.o
diff --git a/trunk/drivers/staging/hv/TODO b/trunk/drivers/staging/hv/TODO
@@ -1,5 +1,4 @@
 TODO:
-	- audit the network driver
 	- audit the scsi driver
 
 Please send patches for this code to Greg Kroah-Hartman <gregkh@suse.de>,
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		obj-$(CONFIG_HYPERV_NET) += hv_netvsc.o

		hv_netvsc-y := netvsc_drv.o netvsc.o rndis_filter.o