diff options
author | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2010-01-07 21:59:57 +0000 |
---|---|---|
committer | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2010-01-07 21:59:57 +0000 |
commit | 7590e5139a7148e76a6adad40f8f3eb3ec9a0b95 (patch) | |
tree | 46e2db26463d402b2a5f9787d361e5e690bd67e7 /package/carl9170/patches/100-request_firmware_compat.patch | |
parent | b0621493f90830d49c24a33b557e230267531e3d (diff) |
add the carl9170 wifi driver for ar9170 devices
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@19066 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/carl9170/patches/100-request_firmware_compat.patch')
-rw-r--r-- | package/carl9170/patches/100-request_firmware_compat.patch | 31 |
1 files changed, 31 insertions, 0 deletions
diff --git a/package/carl9170/patches/100-request_firmware_compat.patch b/package/carl9170/patches/100-request_firmware_compat.patch new file mode 100644 index 0000000000..93fdc6f084 --- /dev/null +++ b/package/carl9170/patches/100-request_firmware_compat.patch @@ -0,0 +1,31 @@ +--- a/drivers/net/wireless/ath/carl9170/usb.c ++++ b/drivers/net/wireless/ath/carl9170/usb.c +@@ -983,11 +983,28 @@ err_failed: + ar9170_usb_firmware_failed(aru); + } + ++ ++ + static int ar9170_usb_request_firmware(struct ar9170_usb *aru) + { ++#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,33)) ++ const struct firmware *fw; ++ int ret; ++ ++ ret = request_firmware(&fw, ++ ar9170_fws[aru->fw_load].files[aru->fw_files].name, ++ &aru->udev->dev); ++ ++ if (ret < 0) ++ return ret; ++ ++ ar9170_usb_firmware_step2(fw, aru); ++ return 0; ++#else + return request_firmware_nowait(THIS_MODULE, 1, + ar9170_fws[aru->fw_load].files[aru->fw_files].name, + &aru->udev->dev, GFP_KERNEL, aru, ar9170_usb_firmware_step2); ++#endif + } + + static void ar9170_usb_disconnect(struct usb_interface *intf) |