From owner-svn-src-all@FreeBSD.ORG  Sun Nov 11 21:58:19 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 39F9D450;
 Sun, 11 Nov 2012 21:58:19 +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 1D8308FC13;
 Sun, 11 Nov 2012 21:58:19 +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 qABLwIcp005817;
 Sun, 11 Nov 2012 21:58:18 GMT (envelope-from adrian@svn.freebsd.org)
Received: (from adrian@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qABLwIod005815;
 Sun, 11 Nov 2012 21:58:18 GMT (envelope-from adrian@svn.freebsd.org)
Message-Id: <201211112158.qABLwIod005815@svn.freebsd.org>
From: Adrian Chadd <adrian@FreeBSD.org>
Date: Sun, 11 Nov 2012 21:58:18 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r242899 - 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 21:58:19 -0000

Author: adrian
Date: Sun Nov 11 21:58:18 2012
New Revision: 242899
URL: http://svnweb.freebsd.org/changeset/base/242899

Log:
  Correctly fix the 'scan during STA mode' crash.

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

Modified: head/sys/dev/ath/if_ath.c
==============================================================================
--- head/sys/dev/ath/if_ath.c	Sun Nov 11 21:57:18 2012	(r242898)
+++ head/sys/dev/ath/if_ath.c	Sun Nov 11 21:58:18 2012	(r242899)
@@ -5598,6 +5598,13 @@ ath_node_set_tim(struct ieee80211_node *
 #else
 	struct ath_vap *avp = ATH_VAP(ni->ni_vap);
 
+	/*
+	 * Some operating omdes don't set av_set_tim(), so don't
+	 * update it here.
+	 */
+	if (avp->av_set_tim == NULL)
+		return (0);
+
 	return (avp->av_set_tim(ni, enable));
 #endif /* ATH_SW_PSQ */
 }