diff options
author | Haiyang Zhang <haiyangz@microsoft.com> | 2011-11-28 16:35:35 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-11-29 02:12:36 -0500 |
commit | 95fa0405c5991726e06c08ffcd8ff872f7fb4f2d (patch) | |
tree | b03a3a6278d9eb2baab16f45082bdb2ac1a6a183 | |
parent | 3b724ca14565747926c23af1fa1afb1848c3f448 (diff) |
staging: hv: move hv_netvsc out of staging area
hv_netvsc has been reviewed on netdev mailing list on 6/09/2011.
All recommended changes have been made. We are requesting to move
it out of staging area.
Signed-off-by: Haiyang Zhang <haiyangz@microsoft.com>
Signed-off-by: KY Srinivasan <kys@microsoft.com>
Signed-off-by: Mike Sterling <Mike.Sterling@microsoft.com>
Acked-by: Stephen Hemminger <shemminger@vyatta.com>
Acked-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r-- | drivers/net/Kconfig | 2 | ||||
-rw-r--r-- | drivers/net/Makefile | 2 | ||||
-rw-r--r-- | drivers/net/hyperv/Kconfig | 5 | ||||
-rw-r--r-- | drivers/net/hyperv/Makefile | 3 | ||||
-rw-r--r-- | drivers/net/hyperv/hyperv_net.h (renamed from drivers/staging/hv/hyperv_net.h) | 0 | ||||
-rw-r--r-- | drivers/net/hyperv/netvsc.c (renamed from drivers/staging/hv/netvsc.c) | 0 | ||||
-rw-r--r-- | drivers/net/hyperv/netvsc_drv.c (renamed from drivers/staging/hv/netvsc_drv.c) | 0 | ||||
-rw-r--r-- | drivers/net/hyperv/rndis_filter.c (renamed from drivers/staging/hv/rndis_filter.c) | 0 | ||||
-rw-r--r-- | drivers/staging/hv/Kconfig | 6 | ||||
-rw-r--r-- | drivers/staging/hv/Makefile | 2 | ||||
-rw-r--r-- | drivers/staging/hv/TODO | 1 |
11 files changed, 12 insertions, 9 deletions
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig index 654a5e94e0e..99aa7faf555 100644 --- a/drivers/net/Kconfig +++ b/drivers/net/Kconfig | |||
@@ -338,4 +338,6 @@ config VMXNET3 | |||
338 | To compile this driver as a module, choose M here: the | 338 | To compile this driver as a module, choose M here: the |
339 | module will be called vmxnet3. | 339 | module will be called vmxnet3. |
340 | 340 | ||
341 | source "drivers/net/hyperv/Kconfig" | ||
342 | |||
341 | endif # NETDEVICES | 343 | endif # NETDEVICES |
diff --git a/drivers/net/Makefile b/drivers/net/Makefile index fa877cd2b13..a81192b902e 100644 --- a/drivers/net/Makefile +++ b/drivers/net/Makefile | |||
@@ -66,3 +66,5 @@ obj-$(CONFIG_USB_USBNET) += usb/ | |||
66 | obj-$(CONFIG_USB_ZD1201) += usb/ | 66 | obj-$(CONFIG_USB_ZD1201) += usb/ |
67 | obj-$(CONFIG_USB_IPHETH) += usb/ | 67 | obj-$(CONFIG_USB_IPHETH) += usb/ |
68 | obj-$(CONFIG_USB_CDC_PHONET) += usb/ | 68 | obj-$(CONFIG_USB_CDC_PHONET) += usb/ |
69 | |||
70 | obj-$(CONFIG_HYPERV_NET) += hyperv/ | ||
diff --git a/drivers/net/hyperv/Kconfig b/drivers/net/hyperv/Kconfig new file mode 100644 index 00000000000..936968d2355 --- /dev/null +++ b/drivers/net/hyperv/Kconfig | |||
@@ -0,0 +1,5 @@ | |||
1 | config HYPERV_NET | ||
2 | tristate "Microsoft Hyper-V virtual network driver" | ||
3 | depends on HYPERV | ||
4 | help | ||
5 | 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 00000000000..c8a66827100 --- /dev/null +++ b/drivers/net/hyperv/Makefile | |||
@@ -0,0 +1,3 @@ | |||
1 | obj-$(CONFIG_HYPERV_NET) += hv_netvsc.o | ||
2 | |||
3 | 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 index ac1ec840512..ac1ec840512 100644 --- a/drivers/staging/hv/hyperv_net.h +++ b/drivers/net/hyperv/hyperv_net.h | |||
diff --git a/drivers/staging/hv/netvsc.c b/drivers/net/hyperv/netvsc.c index 28e69a6c74a..28e69a6c74a 100644 --- a/drivers/staging/hv/netvsc.c +++ b/drivers/net/hyperv/netvsc.c | |||
diff --git a/drivers/staging/hv/netvsc_drv.c b/drivers/net/hyperv/netvsc_drv.c index 93b0e91cbf9..93b0e91cbf9 100644 --- a/drivers/staging/hv/netvsc_drv.c +++ b/drivers/net/hyperv/netvsc_drv.c | |||
diff --git a/drivers/staging/hv/rndis_filter.c b/drivers/net/hyperv/rndis_filter.c index bafccb36004..bafccb36004 100644 --- a/drivers/staging/hv/rndis_filter.c +++ b/drivers/net/hyperv/rndis_filter.c | |||
diff --git a/drivers/staging/hv/Kconfig b/drivers/staging/hv/Kconfig index 072185ebe95..8a5116620a9 100644 --- a/drivers/staging/hv/Kconfig +++ b/drivers/staging/hv/Kconfig | |||
@@ -4,12 +4,6 @@ config HYPERV_STORAGE | |||
4 | help | 4 | help |
5 | Select this option to enable the Hyper-V virtual storage driver. | 5 | Select this option to enable the Hyper-V virtual storage driver. |
6 | 6 | ||
7 | config HYPERV_NET | ||
8 | tristate "Microsoft Hyper-V virtual network driver" | ||
9 | depends on HYPERV && NET | ||
10 | help | ||
11 | Select this option to enable the Hyper-V virtual network driver. | ||
12 | |||
13 | config HYPERV_MOUSE | 7 | config HYPERV_MOUSE |
14 | tristate "Microsoft Hyper-V mouse driver" | 8 | tristate "Microsoft Hyper-V mouse driver" |
15 | depends on HYPERV && HID | 9 | depends on HYPERV && HID |
diff --git a/drivers/staging/hv/Makefile b/drivers/staging/hv/Makefile index 0f55ceee919..6c977473189 100644 --- a/drivers/staging/hv/Makefile +++ b/drivers/staging/hv/Makefile | |||
@@ -1,6 +1,4 @@ | |||
1 | obj-$(CONFIG_HYPERV_STORAGE) += hv_storvsc.o | 1 | obj-$(CONFIG_HYPERV_STORAGE) += hv_storvsc.o |
2 | obj-$(CONFIG_HYPERV_NET) += hv_netvsc.o | ||
3 | obj-$(CONFIG_HYPERV_MOUSE) += hv_mouse.o | 2 | obj-$(CONFIG_HYPERV_MOUSE) += hv_mouse.o |
4 | 3 | ||
5 | hv_storvsc-y := storvsc_drv.o | 4 | hv_storvsc-y := storvsc_drv.o |
6 | hv_netvsc-y := netvsc_drv.o netvsc.o rndis_filter.o | ||
diff --git a/drivers/staging/hv/TODO b/drivers/staging/hv/TODO index ed4d63619df..fd080cbd6a7 100644 --- a/drivers/staging/hv/TODO +++ b/drivers/staging/hv/TODO | |||
@@ -1,5 +1,4 @@ | |||
1 | TODO: | 1 | TODO: |
2 | - audit the network driver | ||
3 | - audit the scsi driver | 2 | - audit the scsi driver |
4 | 3 | ||
5 | Please send patches for this code to Greg Kroah-Hartman <gregkh@suse.de>, | 4 | Please send patches for this code to Greg Kroah-Hartman <gregkh@suse.de>, |