diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig index 654a5e94e0e7c4f227c93b75a7791c406c586d38..99aa7faf5553ef7082696c9855fefeb8c74c61cc 100644 --- a/drivers/net/Kconfig +++ b/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/drivers/net/Makefile b/drivers/net/Makefile index fa877cd2b1393cfd09d107355dc5c4f4526008dc..a81192b902ed536149f2c66d0296251c13148ac4 100644 --- a/drivers/net/Makefile +++ b/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/drivers/net/hyperv/Kconfig b/drivers/net/hyperv/Kconfig new file mode 100644 index 0000000000000000000000000000000000000000..936968d23559903cca61c0da3d159f82658a774c --- /dev/null +++ b/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/drivers/net/hyperv/Makefile b/drivers/net/hyperv/Makefile new file mode 100644 index 0000000000000000000000000000000000000000..c8a66827100cbb5460f07eba41ddee73346ab57a --- /dev/null +++ b/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/drivers/staging/hv/hyperv_net.h b/drivers/net/hyperv/hyperv_net.h similarity index 100% rename from drivers/staging/hv/hyperv_net.h rename to drivers/net/hyperv/hyperv_net.h diff --git a/drivers/staging/hv/netvsc.c b/drivers/net/hyperv/netvsc.c similarity index 100% rename from drivers/staging/hv/netvsc.c rename to drivers/net/hyperv/netvsc.c diff --git a/drivers/staging/hv/netvsc_drv.c b/drivers/net/hyperv/netvsc_drv.c similarity index 100% rename from drivers/staging/hv/netvsc_drv.c rename to drivers/net/hyperv/netvsc_drv.c diff --git a/drivers/staging/hv/rndis_filter.c b/drivers/net/hyperv/rndis_filter.c similarity index 100% rename from drivers/staging/hv/rndis_filter.c rename to drivers/net/hyperv/rndis_filter.c diff --git a/drivers/staging/hv/Kconfig b/drivers/staging/hv/Kconfig index 072185ebe95b4a8a3694fb4019216086893e55f7..8a5116620a9df2f22d46ece35b472483d6b55e67 100644 --- a/drivers/staging/hv/Kconfig +++ b/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/drivers/staging/hv/Makefile b/drivers/staging/hv/Makefile index 0f55ceee919bf98b02fa27fd59e789276ceddaaf..6c977473189c4db3aa88d6c4b4a8c51d0447e390 100644 --- a/drivers/staging/hv/Makefile +++ b/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/drivers/staging/hv/TODO b/drivers/staging/hv/TODO index ed4d63619df280f9285789656db1fd115fdc0cef..fd080cbd6a75a0a3fc0dbb599357079b7a151508 100644 --- a/drivers/staging/hv/TODO +++ b/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 ,