aboutsummaryrefslogtreecommitdiffstats
path: root/package/carl9170/patches
diff options
context:
space:
mode:
Diffstat (limited to 'package/carl9170/patches')
-rw-r--r--package/carl9170/patches/100-request_firmware_compat.patch31
-rw-r--r--package/carl9170/patches/110-ht_default.patch11
-rw-r--r--package/carl9170/patches/120-2.6.35-compat.patch53
3 files changed, 0 insertions, 95 deletions
diff --git a/package/carl9170/patches/100-request_firmware_compat.patch b/package/carl9170/patches/100-request_firmware_compat.patch
deleted file mode 100644
index cc29239c8d..0000000000
--- a/package/carl9170/patches/100-request_firmware_compat.patch
+++ /dev/null
@@ -1,31 +0,0 @@
---- a/drivers/net/wireless/ath/carl9170/usb.c
-+++ b/drivers/net/wireless/ath/carl9170/usb.c
-@@ -1000,11 +1000,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)
diff --git a/package/carl9170/patches/110-ht_default.patch b/package/carl9170/patches/110-ht_default.patch
deleted file mode 100644
index 5e1c4bccfa..0000000000
--- a/package/carl9170/patches/110-ht_default.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/drivers/net/wireless/ath/carl9170/main.c
-+++ b/drivers/net/wireless/ath/carl9170/main.c
-@@ -51,7 +51,7 @@ static int modparam_nohwcrypt;
- module_param_named(nohwcrypt, modparam_nohwcrypt, bool, S_IRUGO);
- MODULE_PARM_DESC(nohwcrypt, "Disable hardware encryption.");
-
--int modparam_ht;
-+int modparam_ht = 1;
- module_param_named(ht, modparam_ht, bool, S_IRUGO);
- MODULE_PARM_DESC(ht, "enable MPDU aggregation.");
-
diff --git a/package/carl9170/patches/120-2.6.35-compat.patch b/package/carl9170/patches/120-2.6.35-compat.patch
deleted file mode 100644
index e413edf2c8..0000000000
--- a/package/carl9170/patches/120-2.6.35-compat.patch
+++ /dev/null
@@ -1,53 +0,0 @@
---- a/drivers/net/wireless/ath/carl9170/main.c
-+++ b/drivers/net/wireless/ath/carl9170/main.c
-@@ -591,21 +591,36 @@ out:
- return err;
- }
-
-+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,35))
-+static u64 ar9170_op_prepare_multicast(struct ieee80211_hw *hw,
-+ struct netdev_hw_addr_list *mclist)
-+#else
- static u64 ar9170_op_prepare_multicast(struct ieee80211_hw *hw, int mc_count,
- struct dev_addr_list *mclist)
-+#endif
- {
- u64 mchash;
-+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,35))
-+ struct netdev_hw_addr *ha;
-+#else
- int i;
-+#endif
-
- /* always get broadcast frames */
- mchash = 1ULL << (0xff >> 2);
-
-+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,35))
-+ netdev_hw_addr_list_for_each(ha, mclist) {
-+ mchash |= 1ULL << (ha->addr[5] >> 2);
-+ }
-+#else
- for (i = 0; i < mc_count; i++) {
- if (WARN_ON(!mclist))
- break;
- mchash |= 1ULL << (mclist->dmi_addr[5] >> 2);
- mclist = mclist->next;
- }
-+#endif
-
- return mchash;
- }
---- a/drivers/net/wireless/ath/carl9170/usb.c
-+++ b/drivers/net/wireless/ath/carl9170/usb.c
-@@ -48,6 +48,11 @@
- #include "fwcmd.h"
- #include "usb.h"
-
-+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,35))
-+#define usb_buffer_alloc(dev, size, mem_flags, dma) usb_alloc_coherent(dev, size, mem_flags, dma)
-+#define usb_buffer_free(dev, size, addr, dma) usb_free_coherent(dev, size, addr, dma)
-+#endif
-+
- MODULE_AUTHOR("Johannes Berg <johannes@sipsolutions.net>");
- MODULE_AUTHOR("Christian Lamparter <chunkeey@googlemail.com>");
- MODULE_LICENSE("GPL");