diff options
| author |   Chun-Yeow Yeoh <yeohchunyeow@gmail.com> | 2015-04-18 01:30:02 +0800 |
|---|---|---|
| committer |   Johannes Berg <johannes.berg@intel.com> | 2015-04-24 12:22:36 +0200 |
| commit | 4292504044a4fd4c5d9155dcb5c7b09ed6cbf611 (patch) | |
| tree | 59f1b484852a3ca32dae76175da37f9fc9022790 /net/wireless | |
| parent | mac80211: use per-CPU TX/RX statistics (diff) | |
| download | linux-dev-4292504044a4fd4c5d9155dcb5c7b09ed6cbf611.tar.xz linux-dev-4292504044a4fd4c5d9155dcb5c7b09ed6cbf611.zip | |
cfg80211: allow the plink state blocking for user managed mesh
wpa_supplicant or authsae handles the mesh peering in user
space, but the plink state is still managed in kernel space.
Currently, there is no implementation by wpa_supplicant or
authsae to block the plink state after it is set to ESTAB.
By applying this patch, we can use the "iw mesh0 station set
<MAC address> plink_action block" to block the peer mesh STA.
This is useful for experimenting purposes.
Signed-off-by: Chun-Yeow Yeoh <yeohchunyeow@gmail.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net/wireless')
| -rw-r--r-- | net/wireless/nl80211.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c index dd78445c7d50..8a33bbae9ec5 100644 --- a/net/wireless/nl80211.c +++ b/net/wireless/nl80211.c @@ -4061,7 +4061,8 @@ int cfg80211_check_station_change(struct wiphy *wiphy, return -EINVAL; break; case CFG80211_STA_MESH_PEER_USER: - if (params->plink_action != NL80211_PLINK_ACTION_NO_ACTION) + if (params->plink_action != NL80211_PLINK_ACTION_NO_ACTION && + params->plink_action != NL80211_PLINK_ACTION_BLOCK) return -EINVAL; break; } |