aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2011-04-14 23:22:21 +0000
committerFelix Fietkau <nbd@openwrt.org>2011-04-14 23:22:21 +0000
commit39fc0fc2f729587020656e9145e2a4ab85fe0921 (patch)
tree9c651749c2a84180bd0ac6f32565862f80f39465
parente0aa62e3c26dcfb33cc1a720b80d8e3dfa0cda92 (diff)
downloadupstream-39fc0fc2f729587020656e9145e2a4ab85fe0921.tar.gz
upstream-39fc0fc2f729587020656e9145e2a4ab85fe0921.tar.bz2
upstream-39fc0fc2f729587020656e9145e2a4ab85fe0921.zip
ath9k: due to popular request, allow ad-hoc+ap again, now that the beacon code can handle it
SVN-Revision: 26668
-rw-r--r--package/mac80211/patches/410-ath9k_allow_adhoc_and_ap.patch17
-rw-r--r--package/mac80211/patches/521-ath9k_fix_ap_ps_buffering.patch4
2 files changed, 19 insertions, 2 deletions
diff --git a/package/mac80211/patches/410-ath9k_allow_adhoc_and_ap.patch b/package/mac80211/patches/410-ath9k_allow_adhoc_and_ap.patch
new file mode 100644
index 0000000000..b03a0661c8
--- /dev/null
+++ b/package/mac80211/patches/410-ath9k_allow_adhoc_and_ap.patch
@@ -0,0 +1,17 @@
+--- a/drivers/net/wireless/ath/ath9k/main.c
++++ b/drivers/net/wireless/ath/ath9k/main.c
+@@ -1483,14 +1483,6 @@ static int ath9k_add_interface(struct ie
+ }
+ }
+
+- if ((vif->type == NL80211_IFTYPE_ADHOC) &&
+- sc->nvifs > 0) {
+- ath_err(common, "Cannot create ADHOC interface when other"
+- " interfaces already exist.\n");
+- ret = -EINVAL;
+- goto out;
+- }
+-
+ ath_dbg(common, ATH_DBG_CONFIG,
+ "Attach a VIF of type: %d\n", vif->type);
+
diff --git a/package/mac80211/patches/521-ath9k_fix_ap_ps_buffering.patch b/package/mac80211/patches/521-ath9k_fix_ap_ps_buffering.patch
index cc956ed279..b6d9a8426e 100644
--- a/package/mac80211/patches/521-ath9k_fix_ap_ps_buffering.patch
+++ b/package/mac80211/patches/521-ath9k_fix_ap_ps_buffering.patch
@@ -29,7 +29,7 @@
/********/
--- a/drivers/net/wireless/ath/ath9k/main.c
+++ b/drivers/net/wireless/ath/ath9k/main.c
-@@ -1800,6 +1800,27 @@ static int ath9k_sta_remove(struct ieee8
+@@ -1792,6 +1792,27 @@ static int ath9k_sta_remove(struct ieee8
return 0;
}
@@ -57,7 +57,7 @@
static int ath9k_conf_tx(struct ieee80211_hw *hw, u16 queue,
const struct ieee80211_tx_queue_params *params)
{
-@@ -2206,6 +2227,7 @@ struct ieee80211_ops ath9k_ops = {
+@@ -2198,6 +2219,7 @@ struct ieee80211_ops ath9k_ops = {
.configure_filter = ath9k_configure_filter,
.sta_add = ath9k_sta_add,
.sta_remove = ath9k_sta_remove,