From owner-svn-src-head@FreeBSD.ORG  Wed Jan 11 17:10:27 2012
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 6C86E106566B;
	Wed, 11 Jan 2012 17:10:27 +0000 (UTC)
	(envelope-from adrian@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 5B3CB8FC0A;
	Wed, 11 Jan 2012 17:10:27 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q0BHARkJ068684;
	Wed, 11 Jan 2012 17:10:27 GMT (envelope-from adrian@svn.freebsd.org)
Received: (from adrian@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q0BHARJO068682;
	Wed, 11 Jan 2012 17:10:27 GMT (envelope-from adrian@svn.freebsd.org)
Message-Id: <201201111710.q0BHARJO068682@svn.freebsd.org>
From: Adrian Chadd <adrian@FreeBSD.org>
Date: Wed, 11 Jan 2012 17:10:27 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r229968 - head/sys/net80211
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 11 Jan 2012 17:10:27 -0000

Author: adrian
Date: Wed Jan 11 17:10:27 2012
New Revision: 229968
URL: http://svn.freebsd.org/changeset/base/229968

Log:
  Add the ability to kick an existing mesh node without waiting for it
  to time out.
  
  Submitted by:	Monthadar Al Jaberi <monthadar@gmail.com>

Modified:
  head/sys/net80211/ieee80211_ioctl.c

Modified: head/sys/net80211/ieee80211_ioctl.c
==============================================================================
--- head/sys/net80211/ieee80211_ioctl.c	Wed Jan 11 16:53:51 2012	(r229967)
+++ head/sys/net80211/ieee80211_ioctl.c	Wed Jan 11 17:10:27 2012	(r229968)
@@ -1397,6 +1397,17 @@ setmlme_common(struct ieee80211vap *vap,
 			    IEEE80211_FC0_SUBTYPE_DEAUTH, reason);
 			ieee80211_free_node(ni);
 			break;
+		case IEEE80211_M_MBSS:
+			IEEE80211_NODE_LOCK(nt);
+			ni = ieee80211_find_node_locked(nt, mac);
+			if (ni != NULL) {
+				ieee80211_node_leave(ni);
+				ieee80211_free_node(ni);
+			} else {
+				error = ENOENT;
+			}
+			IEEE80211_NODE_UNLOCK(nt);
+			break;
 		default:
 			error = EINVAL;
 			break;