aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrey Yurovsky <andrey@cozybit.com>2009-06-16 14:31:04 -0400
committerJohn W. Linville <linville@tuxdriver.com>2009-06-19 11:50:23 -0400
commit155cc9e4b1d60161ee53ffaf2c15b9411f086fa7 (patch)
treee1e2addf6e30169f609454b6dca6c238798f02f8
parenteab0cd493c08632ef10624d0169849c973951c66 (diff)
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 24168560ebae..2c55d25ed34d 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)
1763 goto out_rtnl; 1763 goto out_rtnl;
1764 1764
1765 if (dev->ieee80211_ptr->iftype != NL80211_IFTYPE_AP && 1765 if (dev->ieee80211_ptr->iftype != NL80211_IFTYPE_AP &&
1766 dev->ieee80211_ptr->iftype != NL80211_IFTYPE_AP_VLAN) { 1766 dev->ieee80211_ptr->iftype != NL80211_IFTYPE_AP_VLAN &&
1767 dev->ieee80211_ptr->iftype != NL80211_IFTYPE_MESH_POINT) {
1767 err = -EINVAL; 1768 err = -EINVAL;
1768 goto out; 1769 goto out;
1769 } 1770 }
@@ -1812,7 +1813,8 @@ static int nl80211_del_station(struct sk_buff *skb, struct genl_info *info)
1812 goto out_rtnl; 1813 goto out_rtnl;
1813 1814
1814 if (dev->ieee80211_ptr->iftype != NL80211_IFTYPE_AP && 1815 if (dev->ieee80211_ptr->iftype != NL80211_IFTYPE_AP &&
1815 dev->ieee80211_ptr->iftype != NL80211_IFTYPE_AP_VLAN) { 1816 dev->ieee80211_ptr->iftype != NL80211_IFTYPE_AP_VLAN &&
1817 dev->ieee80211_ptr->iftype != NL80211_IFTYPE_MESH_POINT) {
1816 err = -EINVAL; 1818 err = -EINVAL;
1817 goto out; 1819 goto out;
1818 } 1820 }