From owner-svn-src-projects@FreeBSD.ORG  Tue Jun  9 23:04:44 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 1E3D81065673;
	Tue,  9 Jun 2009 23:04:44 +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 0B1998FC27;
	Tue,  9 Jun 2009 23:04:44 +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 n59N4hm3086757;
	Tue, 9 Jun 2009 23:04:43 GMT (envelope-from rpaulo@svn.freebsd.org)
Received: (from rpaulo@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n59N4hah086756;
	Tue, 9 Jun 2009 23:04:43 GMT (envelope-from rpaulo@svn.freebsd.org)
Message-Id: <200906092304.n59N4hah086756@svn.freebsd.org>
From: Rui Paulo <rpaulo@FreeBSD.org>
Date: Tue, 9 Jun 2009 23:04:43 +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: r193870 - projects/mesh11s/sys/net80211
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: Tue, 09 Jun 2009 23:04:44 -0000

Author: rpaulo
Date: Tue Jun  9 23:04:43 2009
New Revision: 193870
URL: http://svn.freebsd.org/changeset/base/193870

Log:
  Exchange ioctl setter/getter for recently added ioctls.
  
  Sponsored by:	The FreeBSD Foundation

Modified:
  projects/mesh11s/sys/net80211/ieee80211_mesh.c

Modified: projects/mesh11s/sys/net80211/ieee80211_mesh.c
==============================================================================
--- projects/mesh11s/sys/net80211/ieee80211_mesh.c	Tue Jun  9 22:33:34 2009	(r193869)
+++ projects/mesh11s/sys/net80211/ieee80211_mesh.c	Tue Jun  9 23:04:43 2009	(r193870)
@@ -1393,16 +1393,10 @@ mesh_ioctl_get80211(struct ieee80211vap 
 		error = copyout(tmpmeshid, ireq->i_data, ireq->i_len);
 		break;
 	case IEEE80211_IOC_MESH_AP:
-		if (ireq->i_val)
-			vap->iv_meshflags |= IEEE80211_MFLAGS_AP;
-		else
-			vap->iv_meshflags &= ~IEEE80211_MFLAGS_AP;
+		ireq->i_val = (vap->iv_meshflags & IEEE80211_MFLAGS_AP) != 0;
 		break;
 	case IEEE80211_IOC_MESH_FWRD:
-		if (ireq->i_val)
-			vap->iv_meshflags |= IEEE80211_MFLAGS_FWRD;
-		else
-			vap->iv_meshflags &= ~IEEE80211_MFLAGS_FWRD;
+		ireq->i_val = (vap->iv_meshflags & IEEE80211_MFLAGS_FWRD) != 0;
 		break;
 	default:
 		return ENOSYS;
@@ -1434,10 +1428,16 @@ mesh_ioctl_set80211(struct ieee80211vap 
 		memcpy(vap->iv_meshid, tmpmeshid, ireq->i_len);
 		break;
 	case IEEE80211_IOC_MESH_AP:
-		ireq->i_val = (vap->iv_meshflags & IEEE80211_MFLAGS_AP) != 0;
+		if (ireq->i_val)
+			vap->iv_meshflags |= IEEE80211_MFLAGS_AP;
+		else
+			vap->iv_meshflags &= ~IEEE80211_MFLAGS_AP;
 		break;
 	case IEEE80211_IOC_MESH_FWRD:
-		ireq->i_val = (vap->iv_meshflags & IEEE80211_MFLAGS_FWRD) != 0;
+		if (ireq->i_val)
+			vap->iv_meshflags |= IEEE80211_MFLAGS_FWRD;
+		else
+			vap->iv_meshflags &= ~IEEE80211_MFLAGS_FWRD;
 		break;
 	default:
 		return ENOSYS;