mirror of
git://projects.qi-hardware.com/openwrt-xburst.git
synced 2024-07-20 14:55:21 +03:00
442b9d46bb
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@31326 3c298f89-4303-0410-b956-a3cf2f4a3e73
45 lines
1.3 KiB
Diff
45 lines
1.3 KiB
Diff
--- a/drivers/net/wireless/ath/ath9k/main.c
|
|
+++ b/drivers/net/wireless/ath/ath9k/main.c
|
|
@@ -1445,15 +1445,6 @@ static int ath9k_add_interface(struct ie
|
|
}
|
|
}
|
|
|
|
- if ((ah->opmode == NL80211_IFTYPE_ADHOC) ||
|
|
- ((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, CONFIG, "Attach a VIF of type: %d\n", vif->type);
|
|
|
|
sc->nvifs++;
|
|
@@ -1478,15 +1469,6 @@ static int ath9k_change_interface(struct
|
|
mutex_lock(&sc->mutex);
|
|
ath9k_ps_wakeup(sc);
|
|
|
|
- /* See if new interface type is valid. */
|
|
- if ((new_type == NL80211_IFTYPE_ADHOC) &&
|
|
- (sc->nvifs > 1)) {
|
|
- ath_err(common, "When using ADHOC, it must be the only"
|
|
- " interface.\n");
|
|
- ret = -EINVAL;
|
|
- goto out;
|
|
- }
|
|
-
|
|
if (ath9k_uses_beacons(new_type) &&
|
|
!ath9k_uses_beacons(vif->type)) {
|
|
if (sc->nbcnvifs >= ATH_BCBUF) {
|
|
--- a/drivers/net/wireless/ath/ath9k/init.c
|
|
+++ b/drivers/net/wireless/ath/ath9k/init.c
|
|
@@ -655,6 +655,7 @@ static const struct ieee80211_iface_limi
|
|
#ifdef CONFIG_MAC80211_MESH
|
|
BIT(NL80211_IFTYPE_MESH_POINT) |
|
|
#endif
|
|
+ BIT(NL80211_IFTYPE_ADHOC) |
|
|
BIT(NL80211_IFTYPE_AP) |
|
|
BIT(NL80211_IFTYPE_P2P_GO) },
|
|
};
|