diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2013-04-28 12:37:09 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2013-04-28 12:37:09 +0000 |
| commit | d520c048d8eda9083b3fffb4e4e0a82a8a8b0c6b (patch) | |
| tree | 55111555c00d21d4857262bd9ca3ee0bc2bcf222 /package/mac80211/patches/411-ath5k_allow_adhoc_and_ap.patch | |
| parent | acd03cf8d8c3a047108b7983944b0c8d0228f812 (diff) | |
| download | upstream-d520c048d8eda9083b3fffb4e4e0a82a8a8b0c6b.tar.gz upstream-d520c048d8eda9083b3fffb4e4e0a82a8a8b0c6b.tar.bz2 upstream-d520c048d8eda9083b3fffb4e4e0a82a8a8b0c6b.zip | |
mac80211: update to 2013-02-22 from trunk + backports
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/branches/attitude_adjustment@36470 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/mac80211/patches/411-ath5k_allow_adhoc_and_ap.patch')
| -rw-r--r-- | package/mac80211/patches/411-ath5k_allow_adhoc_and_ap.patch | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/package/mac80211/patches/411-ath5k_allow_adhoc_and_ap.patch b/package/mac80211/patches/411-ath5k_allow_adhoc_and_ap.patch index 8e02950e4a..22d911370f 100644 --- a/package/mac80211/patches/411-ath5k_allow_adhoc_and_ap.patch +++ b/package/mac80211/patches/411-ath5k_allow_adhoc_and_ap.patch @@ -18,7 +18,7 @@ goto end; --- a/drivers/net/wireless/ath/ath5k/base.c +++ b/drivers/net/wireless/ath/ath5k/base.c -@@ -1878,7 +1878,7 @@ ath5k_beacon_send(struct ath5k_hw *ah) +@@ -1868,7 +1868,7 @@ ath5k_beacon_send(struct ath5k_hw *ah) } if ((ah->opmode == NL80211_IFTYPE_AP && ah->num_ap_vifs + @@ -27,7 +27,7 @@ ah->opmode == NL80211_IFTYPE_MESH_POINT) { u64 tsf = ath5k_hw_get_tsf64(ah); u32 tsftu = TSF_TO_TU(tsf); -@@ -1964,7 +1964,7 @@ ath5k_beacon_update_timers(struct ath5k_ +@@ -1954,7 +1954,7 @@ ath5k_beacon_update_timers(struct ath5k_ intval = ah->bintval & AR5K_BEACON_PERIOD; if (ah->opmode == NL80211_IFTYPE_AP && ah->num_ap_vifs @@ -36,11 +36,11 @@ intval /= ATH_BCBUF; /* staggered multi-bss beacons */ if (intval < 15) ATH5K_WARN(ah, "intval %u is too low, min 15\n", -@@ -2427,6 +2427,7 @@ static const struct ieee80211_iface_limi - #ifdef CONFIG_MAC80211_MESH +@@ -2418,6 +2418,7 @@ static const struct ieee80211_iface_limi BIT(NL80211_IFTYPE_MESH_POINT) | #endif -+ BIT(NL80211_IFTYPE_ADHOC) | BIT(NL80211_IFTYPE_AP) }, ++ { .max = 1, .types = BIT(NL80211_IFTYPE_ADHOC) }, }; + static const struct ieee80211_iface_combination if_comb = { |