summaryrefslogtreecommitdiff
path: root/patches/collateral-evolutions/network/75-cw1200-workqueues
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2013-08-19 01:37:56 +0200
committerLuis R. Rodriguez <mcgrof@do-not-panic.com>2013-08-27 11:43:04 -0700
commited9d030d93c262c504ffafd9e92c5b705a5da7d8 (patch)
treef55a540efbc81c53e7983b05179feb95718acf60 /patches/collateral-evolutions/network/75-cw1200-workqueues
parent9bb8b700a4fa9de778d1a17c337382e48d3133fd (diff)
backports: refresh on next-20130726
== ckmake-report.log == 1 2.6.24 [ OK ] 2 2.6.25 [ OK ] 3 2.6.26 [ OK ] 4 2.6.27 [ OK ] 5 2.6.28 [ OK ] 6 2.6.29 [ OK ] 7 2.6.30 [ OK ] 8 2.6.31 [ OK ] 9 2.6.32 [ OK ] 10 2.6.33 [ OK ] 11 2.6.34 [ OK ] 12 2.6.35 [ OK ] 13 2.6.36 [ OK ] 14 2.6.37 [ OK ] 15 2.6.38 [ OK ] 16 2.6.39 [ OK ] 17 3.0.89 [ OK ] 18 3.1.10 [ OK ] 19 3.10.5 [ OK ] 20 3.11-rc4 [ OK ] 21 3.2.50 [ OK ] 22 3.3.8 [ OK ] 23 3.4.56 [ OK ] 24 3.5.7 [ OK ] 25 3.6.11 [ OK ] 26 3.7.10 [ OK ] 27 3.8.13 [ OK ] 28 3.9.11 [ OK ] Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> Signed-off-by: Luis R. Rodriguez <mcgrof@do-not-panic.com>
Diffstat (limited to 'patches/collateral-evolutions/network/75-cw1200-workqueues')
-rw-r--r--patches/collateral-evolutions/network/75-cw1200-workqueues/cw1200_workqueues.patch8
1 files changed, 2 insertions, 6 deletions
diff --git a/patches/collateral-evolutions/network/75-cw1200-workqueues/cw1200_workqueues.patch b/patches/collateral-evolutions/network/75-cw1200-workqueues/cw1200_workqueues.patch
index 3bf31970..eee33ddd 100644
--- a/patches/collateral-evolutions/network/75-cw1200-workqueues/cw1200_workqueues.patch
+++ b/patches/collateral-evolutions/network/75-cw1200-workqueues/cw1200_workqueues.patch
@@ -1,5 +1,3 @@
-diff --git a/drivers/net/wireless/cw1200/bh.c b/drivers/net/wireless/cw1200/bh.c
-index c1ec2a4..5dcbb4e 100644
--- a/drivers/net/wireless/cw1200/bh.c
+++ b/drivers/net/wireless/cw1200/bh.c
@@ -48,16 +48,22 @@ enum cw1200_bh_pm_state {
@@ -25,7 +23,7 @@ index c1ec2a4..5dcbb4e 100644
/* Realtime workqueue */
priv->bh_workqueue = alloc_workqueue("cw1200_bh",
WQ_MEM_RECLAIM | WQ_HIGHPRI
-@@ -67,6 +73,7 @@ int cw1200_register_bh(struct cw1200_common *priv)
+@@ -67,6 +73,7 @@ int cw1200_register_bh(struct cw1200_com
return -ENOMEM;
INIT_WORK(&priv->bh_work, cw1200_bh_work);
@@ -33,7 +31,7 @@ index c1ec2a4..5dcbb4e 100644
pr_debug("[BH] register.\n");
-@@ -81,20 +88,44 @@ int cw1200_register_bh(struct cw1200_common *priv)
+@@ -81,20 +88,44 @@ int cw1200_register_bh(struct cw1200_com
init_waitqueue_head(&priv->bh_wq);
init_waitqueue_head(&priv->bh_evt_wq);
@@ -95,8 +93,6 @@ index c1ec2a4..5dcbb4e 100644
}
return 0;
}
-diff --git a/drivers/net/wireless/cw1200/cw1200.h b/drivers/net/wireless/cw1200/cw1200.h
-index 1ad7d36..300dbbb 100644
--- a/drivers/net/wireless/cw1200/cw1200.h
+++ b/drivers/net/wireless/cw1200/cw1200.h
@@ -23,12 +23,18 @@