From owner-svn-src-all@FreeBSD.ORG  Sun Nov 11 00:34:11 2012
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 5E67115F;
 Sun, 11 Nov 2012 00:34:11 +0000 (UTC)
 (envelope-from adrian@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 43E328FC0A;
 Sun, 11 Nov 2012 00:34:11 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qAB0YB8H052473;
 Sun, 11 Nov 2012 00:34:11 GMT (envelope-from adrian@svn.freebsd.org)
Received: (from adrian@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qAB0YBFn052472;
 Sun, 11 Nov 2012 00:34:11 GMT (envelope-from adrian@svn.freebsd.org)
Message-Id: <201211110034.qAB0YBFn052472@svn.freebsd.org>
From: Adrian Chadd <adrian@FreeBSD.org>
Date: Sun, 11 Nov 2012 00:34:11 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r242881 - head/sys/dev/ath
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: Sun, 11 Nov 2012 00:34:11 -0000

Author: adrian
Date: Sun Nov 11 00:34:10 2012
New Revision: 242881
URL: http://svnweb.freebsd.org/changeset/base/242881

Log:
  Don't call av_set_tim() if it's NULL.
  
  This happens during a scan in STA mode; any queued data frames will
  be power save queued but as there's no TIM in STA mode, it panics.
  
  This was introduced by me when I disabled my driver-aware power save
  handling support.

Modified:
  head/sys/dev/ath/if_ath_tx.c

Modified: head/sys/dev/ath/if_ath_tx.c
==============================================================================
--- head/sys/dev/ath/if_ath_tx.c	Sat Nov 10 22:37:06 2012	(r242880)
+++ head/sys/dev/ath/if_ath_tx.c	Sun Nov 11 00:34:10 2012	(r242881)
@@ -1236,6 +1236,8 @@ ath_tx_setds(struct ath_softc *sc, struc
 	struct ath_desc *ds = bf->bf_desc;
 	struct ath_hal *ah = sc->sc_ah;
 
+	bzero(bf->bf_desc, sc->sc_tx_desclen * bf->bf_nseg);
+
 	ath_hal_setuptxdesc(ah, ds
 		, bf->bf_state.bfs_pktlen	/* packet length */
 		, bf->bf_state.bfs_hdrlen	/* header length */