| Message ID | 1423016529-4812-1-git-send-email-masashi.honma@gmail.com (mailing list archive) |
|---|---|
| State | Changes Requested |
| Delegated to: | Johannes Berg |
| Headers | show |
Hi, Sorry about the late reply! I'm getting back to merging now and taking a closer look at this issue. > +++ b/net/wireless/nl80211.c > @@ -5261,7 +5261,7 @@ do { \ > FILL_IN_MESH_PARAM_IF_SET(tb, cfg, dot11MeshAwakeWindowDuration, > 0, 65535, mask, > NL80211_MESHCONF_AWAKE_WINDOW, nla_get_u16); > - FILL_IN_MESH_PARAM_IF_SET(tb, cfg, plink_timeout, 1, 0xffffffff, > + FILL_IN_MESH_PARAM_IF_SET(tb, cfg, plink_timeout, 0, 0xffffffff, > mask, NL80211_MESHCONF_PLINK_TIMEOUT, I think you should document this new behaviour also in nl80211.h. Additionally - what's the plan on how to discover this? Should userspace just try to set with 0 value and then drop back to some big number if it gets an error? johannes -- To unsubscribe from this list: send the line "unsubscribe linux-wireless" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
I will re-send this message to ML because of delivery error. ---------- Forwarded message ---------- From: Masashi Honma <masashi.honma@gmail.com> Date: 2015-02-24 19:00 GMT+09:00 Subject: Re: [PATCH v4] mac80211: Allow 0 for NL80211_MESHCONF_PLINK_TIMEOUT to disable STA expiration To: Johannes Berg <johannes@sipsolutions.net> Cc: "linux-wireless@vger.kernel.org" <linux-wireless@vger.kernel.org>, Bob Copeland <me@bobcopeland.com> 2015-02-24 18:46 GMT+09:00 Johannes Berg <johannes@sipsolutions.net>: > > Hi, > > Sorry about the late reply! I'm getting back to merging now and taking a > closer look at this issue. Thank you for your review. > > > > +++ b/net/wireless/nl80211.c > > @@ -5261,7 +5261,7 @@ do { \ > > FILL_IN_MESH_PARAM_IF_SET(tb, cfg, dot11MeshAwakeWindowDuration, > > 0, 65535, mask, > > NL80211_MESHCONF_AWAKE_WINDOW, nla_get_u16); > > - FILL_IN_MESH_PARAM_IF_SET(tb, cfg, plink_timeout, 1, 0xffffffff, > > + FILL_IN_MESH_PARAM_IF_SET(tb, cfg, plink_timeout, 0, 0xffffffff, > > mask, NL80211_MESHCONF_PLINK_TIMEOUT, > > I think you should document this new behaviour also in nl80211.h. Yes. I will modify and re-send this patch. > > > Additionally - what's the plan on how to discover this? Should userspace > just try to set with 0 value and then drop back to some big number if it > gets an error? I already modified wpa_supplicant by commit 0cb5f8d94536e097af7a11273f79239001a602d6. The way is same as you. It tries to set with 0, if failed it re-try with 60sec future of wpa_supplicant timeout value. -- To unsubscribe from this list: send the line "unsubscribe linux-wireless" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/net/mac80211/mesh.c b/net/mac80211/mesh.c index 0c8b2a7..acf441f 100644 --- a/net/mac80211/mesh.c +++ b/net/mac80211/mesh.c @@ -574,7 +574,8 @@ static void ieee80211_mesh_housekeeping(struct ieee80211_sub_if_data *sdata) struct ieee80211_if_mesh *ifmsh = &sdata->u.mesh; u32 changed; - ieee80211_sta_expire(sdata, ifmsh->mshcfg.plink_timeout * HZ); + if (ifmsh->mshcfg.plink_timeout > 0) + ieee80211_sta_expire(sdata, ifmsh->mshcfg.plink_timeout * HZ); mesh_path_expire(sdata); changed = mesh_accept_plinks_update(sdata); diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c index e9ad9d9..bef52af 100644 --- a/net/wireless/nl80211.c +++ b/net/wireless/nl80211.c @@ -5261,7 +5261,7 @@ do { \ FILL_IN_MESH_PARAM_IF_SET(tb, cfg, dot11MeshAwakeWindowDuration, 0, 65535, mask, NL80211_MESHCONF_AWAKE_WINDOW, nla_get_u16); - FILL_IN_MESH_PARAM_IF_SET(tb, cfg, plink_timeout, 1, 0xffffffff, + FILL_IN_MESH_PARAM_IF_SET(tb, cfg, plink_timeout, 0, 0xffffffff, mask, NL80211_MESHCONF_PLINK_TIMEOUT, nla_get_u32); if (mask_out)
Both wpa_supplicant and mac80211 has inactivity timer. By default wpa_supplicant will be timed out in 5 minutes and mac80211's it is 30 minutes. If wpa_supplicant uses more long timer than mac80211, wpa_supplicant will get unexpected disconnection by mac80211. This patch adds functionality of disabling mac80211 inactivity timer to avoid to prevent wpa_supplicant inactivity timer. I have thought setting 0xffffffff to NL80211_MESHCONF_PLINK_TIMEOUT will solve this problem without this patch. But the approach does not work on 32 bit system. To explain the reason, I will show STA expiration rule in kernel. This is the expression. (current jiffies) > (frame Rx jiffies + NL80211_MESHCONF_PLINK_TIMEOUT * 250) On 32bit system, right side could be over flow and be unexpected small value if NL80211_MESHCONF_PLINK_TIMEOUT is sufficiently large. STA expiration occurs by this reason. So I made this patch. Signed-off-by: Masashi Honma <masashi.honma@gmail.com> --- net/mac80211/mesh.c | 3 ++- net/wireless/nl80211.c | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-)