From owner-svn-src-all@FreeBSD.ORG  Mon Nov 11 08:53:21 2013
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-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 56ACC5BB;
 Mon, 11 Nov 2013 08:53:21 +0000 (UTC)
 (envelope-from adrian@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 42A7F24A1;
 Mon, 11 Nov 2013 08:53:21 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rAB8rLVr064698;
 Mon, 11 Nov 2013 08:53:21 GMT (envelope-from adrian@svn.freebsd.org)
Received: (from adrian@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id rAB8rLSk064697;
 Mon, 11 Nov 2013 08:53:21 GMT (envelope-from adrian@svn.freebsd.org)
Message-Id: <201311110853.rAB8rLSk064697@svn.freebsd.org>
From: Adrian Chadd <adrian@FreeBSD.org>
Date: Mon, 11 Nov 2013 08:53:21 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r257947 - head/sys/dev/iwn
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 11 Nov 2013 08:53:21 -0000

Author: adrian
Date: Mon Nov 11 08:53:20 2013
New Revision: 257947
URL: http://svnweb.freebsd.org/changeset/base/257947

Log:
  Send EAPOL frames at the management rate, not the data rate.
  
  Without this, a far away station with low signal strength would
  associate using the management rate (by default the lowest rate)
  and then the EAPOL frames would go out at the current AMRR best
  guess.  This would result in association failing authentication.
  
  Tested:
  
  * Intel 5100, STA
  * Intel 2230, STA

Modified:
  head/sys/dev/iwn/if_iwn.c

Modified: head/sys/dev/iwn/if_iwn.c
==============================================================================
--- head/sys/dev/iwn/if_iwn.c	Mon Nov 11 08:27:20 2013	(r257946)
+++ head/sys/dev/iwn/if_iwn.c	Mon Nov 11 08:53:20 2013	(r257947)
@@ -3623,6 +3623,8 @@ iwn_tx_data(struct iwn_softc *sc, struct
 		rate = tp->mcastrate;
 	else if (tp->ucastrate != IEEE80211_FIXED_RATE_NONE)
 		rate = tp->ucastrate;
+	else if (m->m_flags & M_EAPOL)
+		rate = tp->mgmtrate;
 	else {
 		/* XXX pass pktlen */
 		(void) ieee80211_ratectl_rate(ni, NULL, 0);