summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrey Yurovsky <andrey@cozybit.com>2009-06-16 11:31:04 -0700
committerJohn W. Linville <linville@tuxdriver.com>2009-06-19 11:50:23 -0400
commit155cc9e4b1d60161ee53ffaf2c15b9411f086fa7 (patch)
treee1e2addf6e30169f609454b6dca6c238798f02f8
parenteab0cd493c08632ef10624d0169849c973951c66 (diff)
downloadkernel-crypto-155cc9e4b1d60161ee53ffaf2c15b9411f086fa7.tar.gz
kernel-crypto-155cc9e4b1d60161ee53ffaf2c15b9411f086fa7.tar.xz
kernel-crypto-155cc9e4b1d60161ee53ffaf2c15b9411f086fa7.zip
cfg80211: allow adding/deleting stations on mesh
Commit b2a151a288 added a check that prevents adding or deleting stations on non-AP interfaces. Adding and deleting stations is supported for Mesh Point interfaces, so add Mesh Point to that check as well. Signed-off-by: Andrey Yurovsky <andrey@cozybit.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
-rw-r--r--net/wireless/nl80211.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c
index 24168560eba..2c55d25ed34 100644
--- a/net/wireless/nl80211.c
+++ b/net/wireless/nl80211.c
@@ -1763,7 +1763,8 @@ static int nl80211_new_station(struct sk_buff *skb, struct genl_info *info)
goto out_rtnl;
if (dev->ieee80211_ptr->iftype != NL80211_IFTYPE_AP &&
- dev->ieee80211_ptr->iftype != NL80211_IFTYPE_AP_VLAN) {
+ dev->ieee80211_ptr->iftype != NL80211_IFTYPE_AP_VLAN &&
+ dev->ieee80211_ptr->iftype != NL80211_IFTYPE_MESH_POINT) {
err = -EINVAL;
goto out;
}
@@ -1812,7 +1813,8 @@ static int nl80211_del_station(struct sk_buff *skb, struct genl_info *info)
goto out_rtnl;
if (dev->ieee80211_ptr->iftype != NL80211_IFTYPE_AP &&
- dev->ieee80211_ptr->iftype != NL80211_IFTYPE_AP_VLAN) {
+ dev->ieee80211_ptr->iftype != NL80211_IFTYPE_AP_VLAN &&
+ dev->ieee80211_ptr->iftype != NL80211_IFTYPE_MESH_POINT) {
err = -EINVAL;
goto out;
}