From owner-svn-src-stable@FreeBSD.ORG  Thu Mar 18 16:55:48 2010
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
Delivered-To: svn-src-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 547391065672;
	Thu, 18 Mar 2010 16:55:48 +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 429E48FC17;
	Thu, 18 Mar 2010 16:55:48 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o2IGtlNu081358;
	Thu, 18 Mar 2010 16:55:47 GMT (envelope-from rpaulo@svn.freebsd.org)
Received: (from rpaulo@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o2IGtlgE081356;
	Thu, 18 Mar 2010 16:55:47 GMT (envelope-from rpaulo@svn.freebsd.org)
Message-Id: <201003181655.o2IGtlgE081356@svn.freebsd.org>
From: Rui Paulo <rpaulo@FreeBSD.org>
Date: Thu, 18 Mar 2010 16:55:47 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org
X-SVN-Group: stable-7
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r205282 - stable/7/sys/net80211
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
	<svn-src-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>, 
	<mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
	<mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 18 Mar 2010 16:55:48 -0000

Author: rpaulo
Date: Thu Mar 18 16:55:47 2010
New Revision: 205282
URL: http://svn.freebsd.org/changeset/base/205282

Log:
  Fix HTCAP's SM power save bits to match the ones in HEAD.
  
  PR:		144476
  Submitted by:	Alexander Egorenkov <egorenar at gmail.com>

Modified:
  stable/7/sys/net80211/ieee80211.h

Modified: stable/7/sys/net80211/ieee80211.h
==============================================================================
--- stable/7/sys/net80211/ieee80211.h	Thu Mar 18 15:28:17 2010	(r205281)
+++ stable/7/sys/net80211/ieee80211.h	Thu Mar 18 16:55:47 2010	(r205282)
@@ -531,10 +531,10 @@ struct ieee80211_ie_htcap {
 #define	IEEE80211_HTCAP_LDPC		0x0001	/* LDPC supported */
 #define	IEEE80211_HTCAP_CHWIDTH40	0x0002	/* 20/40 supported */
 #define	IEEE80211_HTCAP_SMPS		0x000c	/* SM Power Save mode */
-#define	IEEE80211_HTCAP_SMPS_OFF	0x0000	/* none (static mode) */
+#define	IEEE80211_HTCAP_SMPS_OFF	0x000c	/* disabled */
 #define	IEEE80211_HTCAP_SMPS_DYNAMIC	0x0004	/* send RTS first */
 /* NB: SMPS value 2 is reserved */
-#define	IEEE80211_HTCAP_SMPS_ENA	0x000c	/* enabled */
+#define	IEEE80211_HTCAP_SMPS_ENA	0x0000	/* enabled (static mode) */
 #define	IEEE80211_HTCAP_GREENFIELD	0x0010	/* Greenfield supported */
 #define	IEEE80211_HTCAP_SHORTGI20	0x0020	/* Short GI in 20MHz */
 #define	IEEE80211_HTCAP_SHORTGI40	0x0040	/* Short GI in 40MHz */