aboutsummaryrefslogtreecommitdiffstats
path: root/package/kernel/mac80211/patches/901-wlcore-set-irq_flags-in-the-board-files.patch
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2014-01-30 13:21:36 +0000
committerFelix Fietkau <nbd@openwrt.org>2014-01-30 13:21:36 +0000
commit9130ba35ea4e3c09ead64a7f5eb57aaf5b0694a6 (patch)
tree5f1204562d95c9f8f15137504a36ba3ded669320 /package/kernel/mac80211/patches/901-wlcore-set-irq_flags-in-the-board-files.patch
parentfdd820a54af9158b95ecfbb2209d6f3a934cf265 (diff)
downloadupstream-9130ba35ea4e3c09ead64a7f5eb57aaf5b0694a6.tar.gz
upstream-9130ba35ea4e3c09ead64a7f5eb57aaf5b0694a6.tar.bz2
upstream-9130ba35ea4e3c09ead64a7f5eb57aaf5b0694a6.zip
mac80211: update to wireless-testing 2014-01-23
Signed-off-by: Felix Fietkau <nbd@openwrt.org> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@39427 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/kernel/mac80211/patches/901-wlcore-set-irq_flags-in-the-board-files.patch')
-rw-r--r--package/kernel/mac80211/patches/901-wlcore-set-irq_flags-in-the-board-files.patch6
1 files changed, 3 insertions, 3 deletions
diff --git a/package/kernel/mac80211/patches/901-wlcore-set-irq_flags-in-the-board-files.patch b/package/kernel/mac80211/patches/901-wlcore-set-irq_flags-in-the-board-files.patch
index c3334ce0d0..72bb690d33 100644
--- a/package/kernel/mac80211/patches/901-wlcore-set-irq_flags-in-the-board-files.patch
+++ b/package/kernel/mac80211/patches/901-wlcore-set-irq_flags-in-the-board-files.patch
@@ -45,7 +45,7 @@ Acked-by: Sekhar Nori <nsekhar@ti.com>
loopcount = 1;
wl1271_debug(DEBUG_IRQ, "IRQ work");
-@@ -5925,7 +5926,6 @@ struct ieee80211_hw *wlcore_alloc_hw(siz
+@@ -5901,7 +5902,6 @@ struct ieee80211_hw *wlcore_alloc_hw(siz
wl->ap_ps_map = 0;
wl->ap_fw_ps_map = 0;
wl->quirks = 0;
@@ -53,7 +53,7 @@ Acked-by: Sekhar Nori <nsekhar@ti.com>
wl->system_hlid = WL12XX_SYSTEM_HLID;
wl->active_sta_count = 0;
wl->active_link_count = 0;
-@@ -6066,7 +6066,7 @@ static void wlcore_nvs_cb(const struct f
+@@ -6042,7 +6042,7 @@ static void wlcore_nvs_cb(const struct f
struct platform_device *pdev = wl->pdev;
struct wlcore_platdev_data *pdev_data = dev_get_platdata(&pdev->dev);
struct wl12xx_platform_data *pdata = pdev_data->pdata;
@@ -62,7 +62,7 @@ Acked-by: Sekhar Nori <nsekhar@ti.com>
int ret;
irq_handler_t hardirq_fn = NULL;
-@@ -6094,18 +6094,17 @@ static void wlcore_nvs_cb(const struct f
+@@ -6070,18 +6070,17 @@ static void wlcore_nvs_cb(const struct f
wlcore_adjust_conf(wl);
wl->irq = platform_get_irq(pdev, 0);