projects
/
openwrt
/
svn-archive
/
archive.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 2013-06-13 + latest backport infrastructure
[openwrt/svn-archive/archive.git]
/
package
/
mac80211
/
patches
/
411-ath5k_allow_adhoc_and_ap.patch
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 22d911370f65b8ba23994911bd88fdd3d7c6462a..12e03e1bb13876affaf06f91c8fa3979cf3354ab 100644
(file)
--- a/
package/mac80211/patches/411-ath5k_allow_adhoc_and_ap.patch
+++ b/
package/mac80211/patches/411-ath5k_allow_adhoc_and_ap.patch
@@
-1,6
+1,6
@@
--- a/drivers/net/wireless/ath/ath5k/mac80211-ops.c
+++ b/drivers/net/wireless/ath/ath5k/mac80211-ops.c
--- a/drivers/net/wireless/ath/ath5k/mac80211-ops.c
+++ b/drivers/net/wireless/ath/ath5k/mac80211-ops.c
-@@ -8
9,13 +89
,8 @@ ath5k_add_interface(struct ieee80211_hw
+@@ -8
6,13 +86
,8 @@ ath5k_add_interface(struct ieee80211_hw
goto end;
}
goto end;
}
@@
-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
-@@ -1
868,7 +1868
,7 @@ ath5k_beacon_send(struct ath5k_hw *ah)
+@@ -1
916,7 +1916
,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);
-@@ -
1954,7 +1954
,7 @@ ath5k_beacon_update_timers(struct ath5k_
+@@ -
2002,7 +2002
,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",
-@@ -24
18,6 +2418
,7 @@ static const struct ieee80211_iface_limi
+@@ -24
69,6 +2469
,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) },