diff options
| author | Thomas Pedersen <thomas@cozybit.com> | 2013-03-04 13:06:12 -0800 |
|---|---|---|
| committer | Johannes Berg <johannes.berg@intel.com> | 2013-03-06 16:36:12 +0100 |
| commit | a6dad6a26e15f2f9269eea41b756c8cf0971b2bc (patch) | |
| tree | d2a70dcb7f9cb3711270bcb3be5e44ce99734b85 /net/mac80211/mesh.c | |
| parent | eef941e6d6be8bce72b5c2963b69f948be4df7a7 (diff) | |
mac80211: support userspace MPM
Earlier mac80211 would check whether some kind of mesh
security was enabled, when the real question was "is the
MPM in userspace"?
Signed-off-by: Thomas Pedersen <thomas@cozybit.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net/mac80211/mesh.c')
| -rw-r--r-- | net/mac80211/mesh.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/mac80211/mesh.c b/net/mac80211/mesh.c index f5d1afacee8..5ac017f3fcd 100644 --- a/net/mac80211/mesh.c +++ b/net/mac80211/mesh.c @@ -156,7 +156,7 @@ void mesh_sta_cleanup(struct sta_info *sta) * an update. */ changed = mesh_accept_plinks_update(sdata); - if (sdata->u.mesh.security == IEEE80211_MESH_SEC_NONE) { + if (!sdata->u.mesh.user_mpm) { changed |= mesh_plink_deactivate(sta); del_timer_sync(&sta->plink_timer); } |