svn commit: r242899 - head/sys/dev/ath

[Adrian Chadd]

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 */
 }