diff options
| author | Live-CD User <linux@linux.site> | 2009-09-19 11:23:34 -0700 |
|---|---|---|
| committer | Live-CD User <linux@linux.site> | 2009-09-19 11:23:34 -0700 |
| commit | 775089d264ec103fe0c18467d95d7ba183857b95 (patch) | |
| tree | 62b75aba03ff2d2201b8c1649d4f7f997b28b414 /usb | |
| parent | 69679adbcb5ef5d531fd3487222a601002857c6e (diff) | |
| download | patches-775089d264ec103fe0c18467d95d7ba183857b95.tar.gz | |
kay's patch for devtmpfs and resync with upstream
Diffstat (limited to 'usb')
| -rw-r--r-- | usb/usb-gadget-add-eem-gadget-driver.patch | 100 | ||||
| -rw-r--r-- | usb/usb-gadget-ether-needs-to-select-crc32.patch | 2 | ||||
| -rw-r--r-- | usb/usb-gadget-update-freescale-udc-entry-in-maintainers.patch | 2 |
3 files changed, 52 insertions, 52 deletions
diff --git a/usb/usb-gadget-add-eem-gadget-driver.patch b/usb/usb-gadget-add-eem-gadget-driver.patch index b7c27f41bfb043..9ecfbcbf2d83f3 100644 --- a/usb/usb-gadget-add-eem-gadget-driver.patch +++ b/usb/usb-gadget-add-eem-gadget-driver.patch @@ -34,6 +34,55 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> drivers/usb/gadget/u_ether.h | 12 8 files changed, 699 insertions(+), 48 deletions(-) +--- a/drivers/usb/gadget/Kconfig ++++ b/drivers/usb/gadget/Kconfig +@@ -628,8 +628,8 @@ config USB_ETH + tristate "Ethernet Gadget (with CDC Ethernet support)" + depends on NET + help +- This driver implements Ethernet style communication, in either +- of two ways: ++ This driver implements Ethernet style communication, in one of ++ several ways: + + - The "Communication Device Class" (CDC) Ethernet Control Model. + That protocol is often avoided with pure Ethernet adapters, in +@@ -639,7 +639,11 @@ config USB_ETH + - On hardware can't implement that protocol, a simple CDC subset + is used, placing fewer demands on USB. + +- RNDIS support is a third option, more demanding than that subset. ++ - CDC Ethernet Emulation Model (EEM) is a newer standard that has ++ a simpler interface that can be used by more USB hardware. ++ ++ RNDIS support is an additional option, more demanding than than ++ subset. + + Within the USB device, this gadget driver exposes a network device + "usbX", where X depends on what other networking devices you have. +@@ -672,6 +676,22 @@ config USB_ETH_RNDIS + XP, you'll need to download drivers from Microsoft's website; a URL + is given in comments found in that info file. + ++config USB_ETH_EEM ++ bool "Ethernet Emulation Model (EEM) support" ++ depends on USB_ETH ++ default n ++ help ++ CDC EEM is a newer USB standard that is somewhat simpler than CDC ECM ++ and therefore can be supported by more hardware. Technically ECM and ++ EEM are designed for different applications. The ECM model extends ++ the network interface to the target (e.g. a USB cable modem), and the ++ EEM model is for mobile devices to communicate with hosts using ++ ethernet over USB. For Linux gadgets, however, the interface with ++ the host is the same (a usbX device), so the differences are minimal. ++ ++ If you say "y" here, the Ethernet gadget driver will use the EEM ++ protocol rather than ECM. If unsure, say "n". ++ + config USB_GADGETFS + tristate "Gadget Filesystem (EXPERIMENTAL)" + depends on EXPERIMENTAL --- a/drivers/usb/gadget/ether.c +++ b/drivers/usb/gadget/ether.c @@ -61,6 +61,11 @@ @@ -700,58 +749,9 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> } static void rndis_response_available(void *_rndis) ---- a/drivers/usb/gadget/Kconfig -+++ b/drivers/usb/gadget/Kconfig -@@ -620,8 +620,8 @@ config USB_ETH - tristate "Ethernet Gadget (with CDC Ethernet support)" - depends on NET - help -- This driver implements Ethernet style communication, in either -- of two ways: -+ This driver implements Ethernet style communication, in one of -+ several ways: - - - The "Communication Device Class" (CDC) Ethernet Control Model. - That protocol is often avoided with pure Ethernet adapters, in -@@ -631,7 +631,11 @@ config USB_ETH - - On hardware can't implement that protocol, a simple CDC subset - is used, placing fewer demands on USB. - -- RNDIS support is a third option, more demanding than that subset. -+ - CDC Ethernet Emulation Model (EEM) is a newer standard that has -+ a simpler interface that can be used by more USB hardware. -+ -+ RNDIS support is an additional option, more demanding than than -+ subset. - - Within the USB device, this gadget driver exposes a network device - "usbX", where X depends on what other networking devices you have. -@@ -664,6 +668,22 @@ config USB_ETH_RNDIS - XP, you'll need to download drivers from Microsoft's website; a URL - is given in comments found in that info file. - -+config USB_ETH_EEM -+ bool "Ethernet Emulation Model (EEM) support" -+ depends on USB_ETH -+ default n -+ help -+ CDC EEM is a newer USB standard that is somewhat simpler than CDC ECM -+ and therefore can be supported by more hardware. Technically ECM and -+ EEM are designed for different applications. The ECM model extends -+ the network interface to the target (e.g. a USB cable modem), and the -+ EEM model is for mobile devices to communicate with hosts using -+ ethernet over USB. For Linux gadgets, however, the interface with -+ the host is the same (a usbX device), so the differences are minimal. -+ -+ If you say "y" here, the Ethernet gadget driver will use the EEM -+ protocol rather than ECM. If unsure, say "n". -+ - config USB_GADGETFS - tristate "Gadget Filesystem (EXPERIMENTAL)" - depends on EXPERIMENTAL --- a/drivers/usb/gadget/rndis.c +++ b/drivers/usb/gadget/rndis.c -@@ -1022,22 +1022,29 @@ static rndis_resp_t *rndis_add_response +@@ -1022,22 +1022,29 @@ static rndis_resp_t *rndis_add_response return r; } diff --git a/usb/usb-gadget-ether-needs-to-select-crc32.patch b/usb/usb-gadget-ether-needs-to-select-crc32.patch index d965dcac5f63f6..3774406334a062 100644 --- a/usb/usb-gadget-ether-needs-to-select-crc32.patch +++ b/usb/usb-gadget-ether-needs-to-select-crc32.patch @@ -21,7 +21,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> --- a/drivers/usb/gadget/Kconfig +++ b/drivers/usb/gadget/Kconfig -@@ -619,6 +619,7 @@ config USB_AUDIO +@@ -627,6 +627,7 @@ config USB_AUDIO config USB_ETH tristate "Ethernet Gadget (with CDC Ethernet support)" depends on NET diff --git a/usb/usb-gadget-update-freescale-udc-entry-in-maintainers.patch b/usb/usb-gadget-update-freescale-udc-entry-in-maintainers.patch index ba902cc8b45cbc..69e2cbba6b6750 100644 --- a/usb/usb-gadget-update-freescale-udc-entry-in-maintainers.patch +++ b/usb/usb-gadget-update-freescale-udc-entry-in-maintainers.patch @@ -21,7 +21,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> --- a/MAINTAINERS +++ b/MAINTAINERS -@@ -2107,12 +2107,12 @@ S: Supported +@@ -2106,12 +2106,12 @@ S: Supported F: arch/powerpc/sysdev/qe_lib/ F: arch/powerpc/include/asm/*qe.h |