aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2013-08-15 13:57:11 +0000
committerFelix Fietkau <nbd@openwrt.org>2013-08-15 13:57:11 +0000
commitd03d3aa58cd5b184826222f77bb8ba941d16b6aa (patch)
tree3ef998f9ba6689df337f00bbed437ddef9f63336
parent408f0988e919adafde2d7395cc34dd16e7b63c6a (diff)
downloadupstream-d03d3aa58cd5b184826222f77bb8ba941d16b6aa.tar.gz
upstream-d03d3aa58cd5b184826222f77bb8ba941d16b6aa.tar.bz2
upstream-d03d3aa58cd5b184826222f77bb8ba941d16b6aa.zip
mac80211: merge upstream change to fix mesh rssi thresholds
Signed-off-by: Felix Fietkau <nbd@openwrt.org> SVN-Revision: 37793
-rw-r--r--package/kernel/mac80211/patches/300-pending_work.patch12
1 files changed, 12 insertions, 0 deletions
diff --git a/package/kernel/mac80211/patches/300-pending_work.patch b/package/kernel/mac80211/patches/300-pending_work.patch
index 4ee94ef842..b5a9c1a65f 100644
--- a/package/kernel/mac80211/patches/300-pending_work.patch
+++ b/package/kernel/mac80211/patches/300-pending_work.patch
@@ -1537,6 +1537,18 @@
state->filter_wiphy = -1;
ret = nl80211_dump_wiphy_parse(skb, cb, state);
if (ret) {
+@@ -4770,9 +4774,9 @@ do { \
+ FILL_IN_MESH_PARAM_IF_SET(tb, cfg, dot11MeshForwarding, 0, 1,
+ mask, NL80211_MESHCONF_FORWARDING,
+ nla_get_u8);
+- FILL_IN_MESH_PARAM_IF_SET(tb, cfg, rssi_threshold, 1, 255,
++ FILL_IN_MESH_PARAM_IF_SET(tb, cfg, rssi_threshold, -255, 0,
+ mask, NL80211_MESHCONF_RSSI_THRESHOLD,
+- nla_get_u32);
++ nla_get_s32);
+ FILL_IN_MESH_PARAM_IF_SET(tb, cfg, ht_opmode, 0, 16,
+ mask, NL80211_MESHCONF_HT_OPMODE,
+ nla_get_u16);
@@ -6615,12 +6619,14 @@ EXPORT_SYMBOL(cfg80211_testmode_alloc_ev
void cfg80211_testmode_event(struct sk_buff *skb, gfp_t gfp)