diff options
| author | Thomas Pedersen | 2013-03-04 22:06:12 +0100 |
|---|---|---|
| committer | Johannes Berg | 2013-03-06 16:36:12 +0100 |
| commit | a6dad6a26e15f2f9269eea41b756c8cf0971b2bc (patch) | |
| tree | d2a70dcb7f9cb3711270bcb3be5e44ce99734b85 /net/mac80211/rx.c | |
| parent | cfg80211: rename mesh station types (diff) | |
| download | kernel-qcow2-linux-a6dad6a26e15f2f9269eea41b756c8cf0971b2bc.tar.gz kernel-qcow2-linux-a6dad6a26e15f2f9269eea41b756c8cf0971b2bc.tar.xz kernel-qcow2-linux-a6dad6a26e15f2f9269eea41b756c8cf0971b2bc.zip | |
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/rx.c')
| -rw-r--r-- | net/mac80211/rx.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/mac80211/rx.c b/net/mac80211/rx.c index 1f940e2b6f27..5b4492af4e85 100644 --- a/net/mac80211/rx.c +++ b/net/mac80211/rx.c @@ -2543,7 +2543,7 @@ ieee80211_rx_h_action(struct ieee80211_rx_data *rx) case WLAN_SP_MESH_PEERING_CONFIRM: if (!ieee80211_vif_is_mesh(&sdata->vif)) goto invalid; - if (sdata->u.mesh.security != IEEE80211_MESH_SEC_NONE) + if (sdata->u.mesh.user_mpm) /* userspace handles this frame */ break; goto queue; |