projects
/
openwrt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
mac80211: update to wireless-testing 2014-01-23
[openwrt.git]
/
package
/
kernel
/
mac80211
/
patches
/
411-ath5k_allow_adhoc_and_ap.patch
diff --git
a/package/kernel/mac80211/patches/411-ath5k_allow_adhoc_and_ap.patch
b/package/kernel/mac80211/patches/411-ath5k_allow_adhoc_and_ap.patch
index
5af3bd8
..
3487ab2
100644
(file)
--- a/
package/kernel/mac80211/patches/411-ath5k_allow_adhoc_and_ap.patch
+++ b/
package/kernel/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
goto end;
--- a/drivers/net/wireless/ath/ath5k/base.c
+++ b/drivers/net/wireless/ath/ath5k/base.c
-@@ -19
51,7 +1951
,7 @@ ath5k_beacon_send(struct ath5k_hw *ah)
+@@ -19
34,7 +1934
,7 @@ ath5k_beacon_send(struct ath5k_hw *ah)
}
if ((ah->opmode == NL80211_IFTYPE_AP && ah->num_ap_vifs +
}
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);
ah->opmode == NL80211_IFTYPE_MESH_POINT) {
u64 tsf = ath5k_hw_get_tsf64(ah);
u32 tsftu = TSF_TO_TU(tsf);
-@@ -20
37,7 +2037
,7 @@ ath5k_beacon_update_timers(struct ath5k_
+@@ -20
20,7 +2020
,7 @@ ath5k_beacon_update_timers(struct ath5k_
intval = ah->bintval & AR5K_BEACON_PERIOD;
if (ah->opmode == NL80211_IFTYPE_AP && ah->num_ap_vifs
intval = ah->bintval & AR5K_BEACON_PERIOD;
if (ah->opmode == NL80211_IFTYPE_AP && ah->num_ap_vifs
@@
-36,7
+36,7
@@
intval /= ATH_BCBUF; /* staggered multi-bss beacons */
if (intval < 15)
ATH5K_WARN(ah, "intval %u is too low, min 15\n",
intval /= ATH_BCBUF; /* staggered multi-bss beacons */
if (intval < 15)
ATH5K_WARN(ah, "intval %u is too low, min 15\n",
-@@ -2
504,6 +2504
,7 @@ static const struct ieee80211_iface_limi
+@@ -2
487,6 +2487
,7 @@ static const struct ieee80211_iface_limi
BIT(NL80211_IFTYPE_MESH_POINT) |
#endif
BIT(NL80211_IFTYPE_AP) },
BIT(NL80211_IFTYPE_MESH_POINT) |
#endif
BIT(NL80211_IFTYPE_AP) },