Patched in Tegra support.

9 files changed, 33 insertions, 20 deletions

diff --git a/drivers/usb/wusbcore/Kconfig b/drivers/usb/wusbcore/Kconfig
index 8bf19760d44..eb09a0a14a8 100644
--- a/drivers/usb/wusbcore/Kconfig
+++ b/drivers/usb/wusbcore/Kconfig
@@ -2,10 +2,10 @@
 # Wireless USB Core configuration
 #
 config USB_WUSB
-        tristate "Enable Wireless USB extensions"
+        tristate "Enable Wireless USB extensions (EXPERIMENTAL)"
+        depends on EXPERIMENTAL
         depends on USB
-        depends on PCI
-        depends on UWB
+        select UWB
         select CRYPTO
         select CRYPTO_BLKCIPHER
         select CRYPTO_CBC
diff --git a/drivers/usb/wusbcore/cbaf.c b/drivers/usb/wusbcore/cbaf.c
index 7f78f300f8f..200fd7c6c7d 100644
--- a/drivers/usb/wusbcore/cbaf.c
+++ b/drivers/usb/wusbcore/cbaf.c
@@ -655,7 +655,17 @@ static struct usb_driver cbaf_driver = {
         .disconnect =   cbaf_disconnect,
 };
 
-module_usb_driver(cbaf_driver);
+static int __init cbaf_driver_init(void)
+{
+        return usb_register(&cbaf_driver);
+}
+module_init(cbaf_driver_init);
+
+static void __exit cbaf_driver_exit(void)
+{
+        usb_deregister(&cbaf_driver);
+}
+module_exit(cbaf_driver_exit);
 
 MODULE_AUTHOR("Inaky Perez-Gonzalez <inaky.perez-gonzalez@intel.com>");
 MODULE_DESCRIPTION("Wireless USB Cable Based Association");
diff --git a/drivers/usb/wusbcore/devconnect.c b/drivers/usb/wusbcore/devconnect.c
index 1d365316960..7ec24e46b34 100644
--- a/drivers/usb/wusbcore/devconnect.c
+++ b/drivers/usb/wusbcore/devconnect.c
@@ -90,7 +90,6 @@
 #include <linux/ctype.h>
 #include <linux/slab.h>
 #include <linux/workqueue.h>
-#include <linux/export.h>
 #include "wusbhc.h"
 
 static void wusbhc_devconnect_acked_work(struct work_struct *work);
@@ -847,6 +846,19 @@ static void wusb_dev_bos_rm(struct wusb_dev *wusb_dev)
         wusb_dev->wusb_cap_descr = NULL;
 };
 
+static struct usb_wireless_cap_descriptor wusb_cap_descr_default = {
+        .bLength = sizeof(wusb_cap_descr_default),
+        .bDescriptorType = USB_DT_DEVICE_CAPABILITY,
+        .bDevCapabilityType = USB_CAP_TYPE_WIRELESS_USB,
+
+        .bmAttributes = USB_WIRELESS_BEACON_NONE,
+        .wPHYRates = cpu_to_le16(USB_WIRELESS_PHY_53),
+        .bmTFITXPowerInfo = 0,
+        .bmFFITXPowerInfo = 0,
+        .bmBandGroup = cpu_to_le16(0x0001),     /* WUSB1.0[7.4.1] bottom */
+        .bReserved = 0
+};
+
 /*
  * USB stack's device addition Notifier Callback
  *
diff --git a/drivers/usb/wusbcore/mmc.c b/drivers/usb/wusbcore/mmc.c
index b8c72583c04..0a57ff0a0b0 100644
--- a/drivers/usb/wusbcore/mmc.c
+++ b/drivers/usb/wusbcore/mmc.c
@@ -38,7 +38,6 @@
  */
 #include <linux/usb/wusb.h>
 #include <linux/slab.h>
-#include <linux/export.h>
 #include "wusbhc.h"
 
 /* Initialize the MMCIEs handling mechanism */
diff --git a/drivers/usb/wusbcore/rh.c b/drivers/usb/wusbcore/rh.c
index 59ff254dfb6..39de3900ad2 100644
--- a/drivers/usb/wusbcore/rh.c
+++ b/drivers/usb/wusbcore/rh.c
@@ -70,7 +70,6 @@
  * wusbhc_rh_start_port_reset() ??? unimplemented
  */
 #include <linux/slab.h>
-#include <linux/export.h>
 #include "wusbhc.h"
 
 /*
diff --git a/drivers/usb/wusbcore/security.c b/drivers/usb/wusbcore/security.c
index dd88441c8f7..b60799b811c 100644
--- a/drivers/usb/wusbcore/security.c
+++ b/drivers/usb/wusbcore/security.c
@@ -26,7 +26,6 @@
 #include <linux/slab.h>
 #include <linux/usb/ch9.h>
 #include <linux/random.h>
-#include <linux/export.h>
 #include "wusbhc.h"
 
 static void wusbhc_set_gtk_callback(struct urb *urb);
@@ -202,7 +201,7 @@ int wusb_dev_sec_add(struct wusbhc *wusbhc,
 {
         int result, bytes, secd_size;
         struct device *dev = &usb_dev->dev;
-        struct usb_security_descriptor *secd, *new_secd;
+        struct usb_security_descriptor *secd;
         const struct usb_encryption_descriptor *etd, *ccm1_etd = NULL;
         const void *itr, *top;
         char buf[64];
@@ -221,12 +220,11 @@ int wusb_dev_sec_add(struct wusbhc *wusbhc,
                 goto out;
         }
         secd_size = le16_to_cpu(secd->wTotalLength);
-        new_secd = krealloc(secd, secd_size, GFP_KERNEL);
-        if (new_secd == NULL) {
+        secd = krealloc(secd, secd_size, GFP_KERNEL);
+        if (secd == NULL) {
                 dev_err(dev, "Can't allocate space for security descriptors\n");
                 goto out;
         }
-        secd = new_secd;
         result = usb_get_descriptor(usb_dev, USB_DT_SECURITY,
                                     0, secd, secd_size);
         if (result < secd_size) {
@@ -355,7 +353,7 @@ int wusb_dev_4way_handshake(struct wusbhc *wusbhc, struct wusb_dev *wusb_dev,
         struct wusb_keydvt_in keydvt_in;
         struct wusb_keydvt_out keydvt_out;
 
-        hs = kcalloc(3, sizeof(hs[0]), GFP_KERNEL);
+        hs = kzalloc(3*sizeof(hs[0]), GFP_KERNEL);
         if (hs == NULL) {
                 dev_err(dev, "can't allocate handshake data\n");
                 goto error_kzalloc;
diff --git a/drivers/usb/wusbcore/wa-hc.c b/drivers/usb/wusbcore/wa-hc.c
index a09b65ebd9b..59a748a0e5d 100644
--- a/drivers/usb/wusbcore/wa-hc.c
+++ b/drivers/usb/wusbcore/wa-hc.c
@@ -23,7 +23,6 @@
  * FIXME: docs
  */
 #include <linux/slab.h>
-#include <linux/module.h>
 #include "wusbhc.h"
 #include "wa-hc.h"
 
@@ -44,12 +43,10 @@ int wa_create(struct wahc *wa, struct usb_interface *iface)
         /* Fill up Data Transfer EP pointers */
         wa->dti_epd = &iface->cur_altsetting->endpoint[1].desc;
         wa->dto_epd = &iface->cur_altsetting->endpoint[2].desc;
-        wa->xfer_result_size = usb_endpoint_maxp(wa->dti_epd);
+        wa->xfer_result_size = le16_to_cpu(wa->dti_epd->wMaxPacketSize);
         wa->xfer_result = kmalloc(wa->xfer_result_size, GFP_KERNEL);
-        if (wa->xfer_result == NULL) {
-                result = -ENOMEM;
+        if (wa->xfer_result == NULL)
                 goto error_xfer_result_alloc;
-        }
         result = wa_nep_create(wa, iface);
         if (result < 0) {
                 dev_err(dev, "WA-CDS: can't initialize notif endpoint: %d\n",
diff --git a/drivers/usb/wusbcore/wa-rpipe.c b/drivers/usb/wusbcore/wa-rpipe.c
index f0d546c5a08..2acc7f504c5 100644
--- a/drivers/usb/wusbcore/wa-rpipe.c
+++ b/drivers/usb/wusbcore/wa-rpipe.c
@@ -61,7 +61,6 @@
 #include <linux/atomic.h>
 #include <linux/bitmap.h>
 #include <linux/slab.h>
-#include <linux/export.h>
 
 #include "wusbhc.h"
 #include "wa-hc.h"
diff --git a/drivers/usb/wusbcore/wa-xfer.c b/drivers/usb/wusbcore/wa-xfer.c
index 57c01ab09ad..419334568be 100644
--- a/drivers/usb/wusbcore/wa-xfer.c
+++ b/drivers/usb/wusbcore/wa-xfer.c
@@ -84,7 +84,6 @@
 #include <linux/slab.h>
 #include <linux/hash.h>
 #include <linux/ratelimit.h>
-#include <linux/export.h>
 
 #include "wa-hc.h"
 #include "wusbhc.h"