diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2014-06-11 12:30:50 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2014-06-11 12:30:50 +0000 |
| commit | 3153b7589c0831fdce97081d1ecf5b9310725576 (patch) | |
| tree | 5e4608250807827642c1d1fb19849d3671443ae7 /package/mac80211/patches/411-ath5k_allow_adhoc_and_ap.patch | |
| parent | 312a176995ecf1b1b97a048451e4ff28b4336f85 (diff) | |
| download | upstream-3153b7589c0831fdce97081d1ecf5b9310725576.tar.gz upstream-3153b7589c0831fdce97081d1ecf5b9310725576.tar.bz2 upstream-3153b7589c0831fdce97081d1ecf5b9310725576.zip | |
AA: mac80211: sync with trunk r41113
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/branches/attitude_adjustment@41116 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 | 6 |
1 files changed, 3 insertions, 3 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 3487ab26f2..1f069946cd 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 -@@ -1934,7 +1934,7 @@ ath5k_beacon_send(struct ath5k_hw *ah) +@@ -1937,7 +1937,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); -@@ -2020,7 +2020,7 @@ ath5k_beacon_update_timers(struct ath5k_ +@@ -2023,7 +2023,7 @@ ath5k_beacon_update_timers(struct ath5k_ 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", -@@ -2487,6 +2487,7 @@ static const struct ieee80211_iface_limi +@@ -2490,6 +2490,7 @@ static const struct ieee80211_iface_limi BIT(NL80211_IFTYPE_MESH_POINT) | #endif BIT(NL80211_IFTYPE_AP) }, |