From 9acec39f916d0d9d8ced4317f3b3f8ab9ebdd70d Mon Sep 17 00:00:00 2001 From: Marco Porsch Date: Tue, 30 Mar 2010 10:00:16 +0200 Subject: [PATCH] --- yaml --- r: 194169 b: refs/heads/master c: d5d9de024c157a3dfbab191241c5c51e4d4c069a h: refs/heads/master i: 194167: 63eef8082e6f0fbf29e3b0923dc6e724194bd89d v: v3 --- [refs] | 2 +- trunk/net/wireless/nl80211.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 4ec4901f21b0..226c0e0400ea 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 932d37c094b3c3410b4059f18f3b5c756bff059a +refs/heads/master: d5d9de024c157a3dfbab191241c5c51e4d4c069a diff --git a/trunk/net/wireless/nl80211.c b/trunk/net/wireless/nl80211.c index a7fc3d83f5f6..95149f303409 100644 --- a/trunk/net/wireless/nl80211.c +++ b/trunk/net/wireless/nl80211.c @@ -2096,7 +2096,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; }