1
0
mirror of git://projects.qi-hardware.com/openwrt-xburst.git synced 2024-11-30 21:39:43 +02:00

ath9k: due to popular request, allow ad-hoc+ap again, now that the beacon code can handle it (backport of r26668)

git-svn-id: svn://svn.openwrt.org/openwrt/branches/backfire@26669 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
nbd 2011-04-14 23:22:51 +00:00
parent 2bb67a3907
commit fe530a400c
2 changed files with 19 additions and 2 deletions

View File

@ -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);

View File

@ -29,7 +29,7 @@
/********/ /********/
--- a/drivers/net/wireless/ath/ath9k/main.c --- a/drivers/net/wireless/ath/ath9k/main.c
+++ b/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; return 0;
} }
@ -57,7 +57,7 @@
static int ath9k_conf_tx(struct ieee80211_hw *hw, u16 queue, static int ath9k_conf_tx(struct ieee80211_hw *hw, u16 queue,
const struct ieee80211_tx_queue_params *params) 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, .configure_filter = ath9k_configure_filter,
.sta_add = ath9k_sta_add, .sta_add = ath9k_sta_add,
.sta_remove = ath9k_sta_remove, .sta_remove = ath9k_sta_remove,