From owner-svn-soc-all@FreeBSD.ORG  Sun Aug 25 10:30:36 2013
Return-Path: <owner-svn-soc-all@FreeBSD.ORG>
Delivered-To: svn-soc-all@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTP id 79F75BF0
 for <svn-soc-all@FreeBSD.org>; Sun, 25 Aug 2013 10:30:36 +0000 (UTC)
 (envelope-from ccqin@FreeBSD.org)
Received: from socsvn.freebsd.org (socsvn.freebsd.org
 [IPv6:2001:1900:2254:206a::50:2])
 (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 61585262D
 for <svn-soc-all@FreeBSD.org>; Sun, 25 Aug 2013 10:30:36 +0000 (UTC)
Received: from socsvn.freebsd.org ([127.0.1.124])
 by socsvn.freebsd.org (8.14.7/8.14.7) with ESMTP id r7PAUaxK031730
 for <svn-soc-all@FreeBSD.org>; Sun, 25 Aug 2013 10:30:36 GMT
 (envelope-from ccqin@FreeBSD.org)
Received: (from www@localhost)
 by socsvn.freebsd.org (8.14.7/8.14.6/Submit) id r7PAUaXI031724
 for svn-soc-all@FreeBSD.org; Sun, 25 Aug 2013 10:30:36 GMT
 (envelope-from ccqin@FreeBSD.org)
Date: Sun, 25 Aug 2013 10:30:36 GMT
Message-Id: <201308251030.r7PAUaXI031724@socsvn.freebsd.org>
X-Authentication-Warning: socsvn.freebsd.org: www set sender to
 ccqin@FreeBSD.org using -f
From: ccqin@FreeBSD.org
To: svn-soc-all@FreeBSD.org
Subject: socsvn commit: r256490 - soc2013/ccqin/head/sys/net80211
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-soc-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the entire Summer of Code repository
 <svn-soc-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-soc-all>,
 <mailto:svn-soc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-soc-all>
List-Post: <mailto:svn-soc-all@freebsd.org>
List-Help: <mailto:svn-soc-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-soc-all>,
 <mailto:svn-soc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 25 Aug 2013 10:30:36 -0000

Author: ccqin
Date: Sun Aug 25 10:30:36 2013
New Revision: 256490
URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=256490

Log:
  swap

Modified:
  soc2013/ccqin/head/sys/net80211/ieee80211_ratectl_none.c

Modified: soc2013/ccqin/head/sys/net80211/ieee80211_ratectl_none.c
==============================================================================
--- soc2013/ccqin/head/sys/net80211/ieee80211_ratectl_none.c	Sun Aug 25 10:25:21 2013	(r256489)
+++ soc2013/ccqin/head/sys/net80211/ieee80211_ratectl_none.c	Sun Aug 25 10:30:36 2013	(r256490)
@@ -44,6 +44,7 @@
 
 #include <net80211/ieee80211_var.h>
 #include <net80211/ieee80211_ratectl.h>
+#include <net80211/ieee80211_ratectl_none.h>
 
 static void
 none_init(struct ieee80211vap *vap, uint32_t capabilities)
@@ -74,9 +75,8 @@
 static void
 none_node_init(struct ieee80211_node *ni)
 {
-		const struct ieee80211_rateset *rs = NULL;
 	struct ieee80211vap *vap = ni->ni_vap;
-	struct ieee80211_amrr *amrr = vap->iv_rs;
+	struct ieee80211_none *none = vap->iv_rs;
 	struct ieee80211_none_node *non;
 	uint8_t rate;