From owner-svn-src-head@FreeBSD.ORG  Sat Apr 10 07:00:26 2010
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id CEF04106564A;
	Sat, 10 Apr 2010 07:00:26 +0000 (UTC)
	(envelope-from bschmidt@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id BBF088FC18;
	Sat, 10 Apr 2010 07:00:26 +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 o3A70QcE005483;
	Sat, 10 Apr 2010 07:00:26 GMT
	(envelope-from bschmidt@svn.freebsd.org)
Received: (from bschmidt@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o3A70QG1005481;
	Sat, 10 Apr 2010 07:00:26 GMT
	(envelope-from bschmidt@svn.freebsd.org)
Message-Id: <201004100700.o3A70QG1005481@svn.freebsd.org>
From: Bernhard Schmidt <bschmidt@FreeBSD.org>
Date: Sat, 10 Apr 2010 07:00:26 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r206445 - head/sys/dev/iwn
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 10 Apr 2010 07:00:26 -0000

Author: bschmidt
Date: Sat Apr 10 07:00:26 2010
New Revision: 206445
URL: http://svn.freebsd.org/changeset/base/206445

Log:
  iwn4965_set_txpower() uses maxpwr from EEPROM to calculate the power to
  set, it make sense to actually initialize that array.  This fixes some
  issues with 4965 adapters where the TX power is crucial.
  
  This got lost somewhere while merging with the OpenBSD code.
  
  Approved by:	rpaulo (mentor)
  Obtained from:	OpenBSD
  MFC after:	2 weeks

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

Modified: head/sys/dev/iwn/if_iwn.c
==============================================================================
--- head/sys/dev/iwn/if_iwn.c	Sat Apr 10 06:58:24 2010	(r206444)
+++ head/sys/dev/iwn/if_iwn.c	Sat Apr 10 07:00:26 2010	(r206445)
@@ -1711,6 +1711,10 @@ iwn_read_eeprom_band(struct iwn_softc *s
 		c->ic_ieee = chan;
 		c->ic_maxregpower = channels[i].maxpwr;
 		c->ic_maxpower = 2*c->ic_maxregpower;
+
+		/* Save maximum allowed TX power for this channel. */
+		sc->maxpwr[chan] = channels[i].maxpwr;
+
 		if (n == 0) {	/* 2GHz band */
 			c->ic_freq = ieee80211_ieee2mhz(chan,
 			    IEEE80211_CHAN_G);