diff options
author | Greg Kroah-Hartman <gregkh@suse.de> | 2005-12-02 11:46:55 -0800 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2005-12-02 11:46:55 -0800 |
commit | 0711451a0ca360d94ffb0b63df1a95870c33eb97 (patch) | |
tree | 231b4d90129ae49175db5cd311780cf72e102718 /usb | |
parent | 40f14e01fbeb9ebf14f72a8375063e3e5656be6d (diff) | |
download | patches-0711451a0ca360d94ffb0b63df1a95870c33eb97.tar.gz |
usbip: fixes
- moved directory to drivers/usb/ip/
- renamed vhci to vhci-hcd
Diffstat (limited to 'usb')
-rw-r--r-- | usb/usbip.patch | 72 |
1 files changed, 36 insertions, 36 deletions
diff --git a/usb/usbip.patch b/usb/usbip.patch index fde9a8cd7baf9..bf8015185358f 100644 --- a/usb/usbip.patch +++ b/usb/usbip.patch @@ -8,23 +8,23 @@ See http://usbip.naist.jp/ for more information about this project, and a link to the userspace tools needed to get this to work. --- - drivers/usb/Kconfig | 2 - drivers/usb/Makefile | 2 - drivers/usb/usbip/Kconfig | 12 - drivers/usb/usbip/Makefile | 13 - drivers/usb/usbip/stub.h | 93 +++ - drivers/usb/usbip/stub_dev.c | 419 +++++++++++++++ - drivers/usb/usbip/stub_main.c | 319 ++++++++++++ - drivers/usb/usbip/stub_rx.c | 345 +++++++++++++ - drivers/usb/usbip/stub_tx.c | 205 +++++++ - drivers/usb/usbip/usbip_common.c | 891 +++++++++++++++++++++++++++++++++ - drivers/usb/usbip/usbip_common.h | 388 ++++++++++++++ - drivers/usb/usbip/usbip_event.c | 147 +++++ - drivers/usb/usbip/vhci.h | 116 ++++ - drivers/usb/usbip/vhci_hcd.c | 1026 +++++++++++++++++++++++++++++++++++++++ - drivers/usb/usbip/vhci_rx.c | 149 +++++ - drivers/usb/usbip/vhci_sysfs.c | 268 ++++++++++ - drivers/usb/usbip/vhci_tx.c | 165 ++++++ + drivers/usb/Kconfig | 2 + drivers/usb/Makefile | 2 + drivers/usb/ip/Kconfig | 12 + drivers/usb/ip/Makefile | 13 + drivers/usb/ip/stub.h | 93 +++ + drivers/usb/ip/stub_dev.c | 419 +++++++++++++++++ + drivers/usb/ip/stub_main.c | 319 +++++++++++++ + drivers/usb/ip/stub_rx.c | 345 ++++++++++++++ + drivers/usb/ip/stub_tx.c | 205 ++++++++ + drivers/usb/ip/usbip_common.c | 891 ++++++++++++++++++++++++++++++++++++ + drivers/usb/ip/usbip_common.h | 388 +++++++++++++++ + drivers/usb/ip/usbip_event.c | 147 ++++++ + drivers/usb/ip/vhci.h | 116 ++++ + drivers/usb/ip/vhci_hcd.c | 1026 ++++++++++++++++++++++++++++++++++++++++++ + drivers/usb/ip/vhci_rx.c | 149 ++++++ + drivers/usb/ip/vhci_sysfs.c | 268 ++++++++++ + drivers/usb/ip/vhci_tx.c | 165 ++++++ 17 files changed, 4560 insertions(+) --- gregkh-2.6.orig/drivers/usb/Kconfig @@ -33,13 +33,13 @@ a link to the userspace tools needed to get this to work. source "drivers/usb/host/Kconfig" -+source "drivers/usb/usbip/Kconfig" ++source "drivers/usb/ip/Kconfig" + source "drivers/usb/class/Kconfig" source "drivers/usb/storage/Kconfig" --- /dev/null -+++ gregkh-2.6/drivers/usb/usbip/Kconfig ++++ gregkh-2.6/drivers/usb/ip/Kconfig @@ -0,0 +1,12 @@ +config USB_IP + bool "USB IP support" @@ -59,18 +59,18 @@ a link to the userspace tools needed to get this to work. obj-$(CONFIG_USB_SL811_HCD) += host/ obj-$(CONFIG_ETRAX_USB_HOST) += host/ -+obj-$(CONFIG_USB_IP) += usbip/ ++obj-$(CONFIG_USB_IP) += ip/ + obj-$(CONFIG_USB_ACM) += class/ obj-$(CONFIG_USB_PRINTER) += class/ --- /dev/null -+++ gregkh-2.6/drivers/usb/usbip/Makefile ++++ gregkh-2.6/drivers/usb/ip/Makefile @@ -0,0 +1,13 @@ +# Makefile for the USB/IP driver + -+obj-$(CONFIG_USB_IP_VHCI) += vhci.o -+vhci-objs := usbip_common.o usbip_event.o vhci_sysfs.o vhci_tx.o vhci_rx.o vhci_hcd.o ++obj-$(CONFIG_USB_IP_VHCI) += vhci-hcd.o ++vhci-hcd-objs := usbip_common.o usbip_event.o vhci_sysfs.o vhci_tx.o vhci_rx.o vhci_hcd.o + +obj-$(CONFIG_USB_IP_STUB) += stub.o +stub-objs := usbip_common.o usbip_event.o stub_dev.o stub_main.o stub_rx.o stub_tx.o @@ -81,7 +81,7 @@ a link to the userspace tools needed to get this to work. +endif + --- /dev/null -+++ gregkh-2.6/drivers/usb/usbip/stub.h ++++ gregkh-2.6/drivers/usb/ip/stub.h @@ -0,0 +1,93 @@ +/* + * $Id: stub.h 265 2005-09-01 09:24:10Z taka-hir $ @@ -177,7 +177,7 @@ a link to the userspace tools needed to get this to work. + +//void stub_shutdown_connection(struct usbip_device *sdev); --- /dev/null -+++ gregkh-2.6/drivers/usb/usbip/stub_dev.c ++++ gregkh-2.6/drivers/usb/ip/stub_dev.c @@ -0,0 +1,419 @@ +/* + * $Id: stub_dev.c 265 2005-09-01 09:24:10Z taka-hir $ @@ -599,7 +599,7 @@ a link to the userspace tools needed to get this to work. + VHCI_DEBUG("bye\n"); +} --- /dev/null -+++ gregkh-2.6/drivers/usb/usbip/stub_main.c ++++ gregkh-2.6/drivers/usb/ip/stub_main.c @@ -0,0 +1,319 @@ +/* + * $Id: stub_main.c 265 2005-09-01 09:24:10Z taka-hir $ @@ -921,7 +921,7 @@ a link to the userspace tools needed to get this to work. +MODULE_DESCRIPTION(DRIVER_DESC); +MODULE_LICENSE("GPL"); --- /dev/null -+++ gregkh-2.6/drivers/usb/usbip/stub_rx.c ++++ gregkh-2.6/drivers/usb/ip/stub_rx.c @@ -0,0 +1,345 @@ +/* + * $Id: stub_rx.c 276 2005-11-22 08:06:10Z taka-hir $ @@ -1269,7 +1269,7 @@ a link to the userspace tools needed to get this to work. +} + --- /dev/null -+++ gregkh-2.6/drivers/usb/usbip/stub_tx.c ++++ gregkh-2.6/drivers/usb/ip/stub_tx.c @@ -0,0 +1,205 @@ +/* + * $Id: stub_tx.c 265 2005-09-01 09:24:10Z taka-hir $ @@ -1477,7 +1477,7 @@ a link to the userspace tools needed to get this to work. + } +} --- /dev/null -+++ gregkh-2.6/drivers/usb/usbip/usbip_common.c ++++ gregkh-2.6/drivers/usb/ip/usbip_common.c @@ -0,0 +1,891 @@ +/* + * $Id: usbip_common.c 265 2005-09-01 09:24:10Z taka-hir $ @@ -2371,7 +2371,7 @@ a link to the userspace tools needed to get this to work. +} +DEVICE_ATTR(usbip_debug, (S_IRUGO | S_IWUSR), show_flag, store_flag); --- /dev/null -+++ gregkh-2.6/drivers/usb/usbip/usbip_common.h ++++ gregkh-2.6/drivers/usb/ip/usbip_common.h @@ -0,0 +1,388 @@ +/* + * $Id: usbip_common.h 265 2005-09-01 09:24:10Z taka-hir $ @@ -2762,7 +2762,7 @@ a link to the userspace tools needed to get this to work. + +#endif --- /dev/null -+++ gregkh-2.6/drivers/usb/usbip/usbip_event.c ++++ gregkh-2.6/drivers/usb/ip/usbip_event.c @@ -0,0 +1,147 @@ +/* + * $Id: usbip_event.c 261 2005-08-30 10:49:17Z taka-hir $ @@ -2912,7 +2912,7 @@ a link to the userspace tools needed to get this to work. +} + --- /dev/null -+++ gregkh-2.6/drivers/usb/usbip/vhci.h ++++ gregkh-2.6/drivers/usb/ip/vhci.h @@ -0,0 +1,116 @@ +/* + * $Id: vhci.h 249 2005-08-10 12:15:26Z taka-hir $ @@ -3031,7 +3031,7 @@ a link to the userspace tools needed to get this to work. +/* vhci_sysfs.c */ +extern struct attribute_group dev_attr_group; --- /dev/null -+++ gregkh-2.6/drivers/usb/usbip/vhci_hcd.c ++++ gregkh-2.6/drivers/usb/ip/vhci_hcd.c @@ -0,0 +1,1026 @@ +/* + * $Id: vhci_hcd.c 267 2005-09-02 17:21:42Z taka-hir $ @@ -4060,7 +4060,7 @@ a link to the userspace tools needed to get this to work. +} +module_exit(vhci_cleanup); --- /dev/null -+++ gregkh-2.6/drivers/usb/usbip/vhci_rx.c ++++ gregkh-2.6/drivers/usb/ip/vhci_rx.c @@ -0,0 +1,149 @@ +/* + * $Id: vhci_rx.c 265 2005-09-01 09:24:10Z taka-hir $ @@ -4212,7 +4212,7 @@ a link to the userspace tools needed to get this to work. +} + --- /dev/null -+++ gregkh-2.6/drivers/usb/usbip/vhci_sysfs.c ++++ gregkh-2.6/drivers/usb/ip/vhci_sysfs.c @@ -0,0 +1,268 @@ +/* + * $Id: vhci_sysfs.c 260 2005-08-30 10:35:16Z taka-hir $ @@ -4483,7 +4483,7 @@ a link to the userspace tools needed to get this to work. +}; + --- /dev/null -+++ gregkh-2.6/drivers/usb/usbip/vhci_tx.c ++++ gregkh-2.6/drivers/usb/ip/vhci_tx.c @@ -0,0 +1,165 @@ +/* + * $Id: vhci_tx.c 260 2005-08-30 10:35:16Z taka-hir $ |