From owner-svn-src-projects@FreeBSD.ORG  Wed May  6 18:27:12 2009
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id D898C106566C;
	Wed,  6 May 2009 18:27:12 +0000 (UTC)
	(envelope-from rpaulo@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id C7EB68FC08;
	Wed,  6 May 2009 18:27:12 +0000 (UTC)
	(envelope-from rpaulo@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n46IRCjB026018;
	Wed, 6 May 2009 18:27:12 GMT (envelope-from rpaulo@svn.freebsd.org)
Received: (from rpaulo@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n46IRCJ3026016;
	Wed, 6 May 2009 18:27:12 GMT (envelope-from rpaulo@svn.freebsd.org)
Message-Id: <200905061827.n46IRCJ3026016@svn.freebsd.org>
From: Rui Paulo <rpaulo@FreeBSD.org>
Date: Wed, 6 May 2009 18:27:12 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r191851 - projects/mesh11s/sys/dev/ath
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
	tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 06 May 2009 18:27:13 -0000

Author: rpaulo
Date: Wed May  6 18:27:12 2009
New Revision: 191851
URL: http://svn.freebsd.org/changeset/base/191851

Log:
  Add a few more MBSS handling cases.
  
  Sponsored by:	The FreeBSD Foundation

Modified:
  projects/mesh11s/sys/dev/ath/if_ath.c

Modified: projects/mesh11s/sys/dev/ath/if_ath.c
==============================================================================
--- projects/mesh11s/sys/dev/ath/if_ath.c	Wed May  6 18:24:56 2009	(r191850)
+++ projects/mesh11s/sys/dev/ath/if_ath.c	Wed May  6 18:27:12 2009	(r191851)
@@ -883,9 +883,11 @@ ath_vap_create(struct ieee80211com *ic,
 			ic_opmode = opmode;
 		break;
 	case IEEE80211_M_IBSS:
+	case IEEE80211_M_MBSS:
 		if (sc->sc_nvaps != 0) {	/* XXX only 1 for now */
 			device_printf(sc->sc_dev,
-			    "only 1 ibss vap supported\n");
+			    "only 1 %s vap supported\n",
+			    (opmode == IEEE80211_M_IBSS) ? "ibss" : "mbss");
 			goto bad;
 		}
 		ic_opmode = opmode;
@@ -924,11 +926,6 @@ ath_vap_create(struct ieee80211com *ic,
 			flags &= ~IEEE80211_CLONE_BSSID;
 		}
 		ic_opmode = IEEE80211_M_HOSTAP;
-		break;
-	case IEEE80211_M_MBSS:
-		ic_opmode = IEEE80211_M_IBSS;
-		/* XXXRP TBD */
-		break;
 	default:
 		device_printf(sc->sc_dev, "unknown opmode %d\n", opmode);
 		goto bad;
@@ -1034,6 +1031,7 @@ ath_vap_create(struct ieee80211com *ic,
 		/* fall thru... */
 #endif
 	case IEEE80211_M_HOSTAP:
+	case IEEE80211_M_MBSS:
 		sc->sc_opmode = HAL_M_HOSTAP;
 		break;
 	case IEEE80211_M_MONITOR:
@@ -5609,6 +5607,7 @@ ath_newstate(struct ieee80211vap *vap, e
 #endif
 		case IEEE80211_M_HOSTAP:
 		case IEEE80211_M_IBSS:
+		case IEEE80211_M_MBSS:
 			/*
 			 * Allocate and setup the beacon frame.
 			 *