From owner-svn-src-stable-10@FreeBSD.ORG  Sat Oct 25 15:06:10 2014
Return-Path: <owner-svn-src-stable-10@FreeBSD.ORG>
Delivered-To: svn-src-stable-10@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 9744A53A;
 Sat, 25 Oct 2014 15:06:10 +0000 (UTC)
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))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 82CB0126;
 Sat, 25 Oct 2014 15:06:10 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s9PF6AaT054256;
 Sat, 25 Oct 2014 15:06:10 GMT (envelope-from kevlo@FreeBSD.org)
Received: (from kevlo@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id s9PF6ACu054255;
 Sat, 25 Oct 2014 15:06:10 GMT (envelope-from kevlo@FreeBSD.org)
Message-Id: <201410251506.s9PF6ACu054255@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: kevlo set sender to
 kevlo@FreeBSD.org using -f
From: Kevin Lo <kevlo@FreeBSD.org>
Date: Sat, 25 Oct 2014 15:06:10 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject: svn commit: r273636 - stable/10/sys/dev/usb/wlan
X-SVN-Group: stable-10
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable-10@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: SVN commit messages for only the 10-stable src tree
 <svn-src-stable-10.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-stable-10>, 
 <mailto:svn-src-stable-10-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-10/>
List-Post: <mailto:svn-src-stable-10@freebsd.org>
List-Help: <mailto:svn-src-stable-10-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-stable-10>, 
 <mailto:svn-src-stable-10-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 25 Oct 2014 15:06:10 -0000

Author: kevlo
Date: Sat Oct 25 15:06:09 2014
New Revision: 273636
URL: https://svnweb.freebsd.org/changeset/base/273636

Log:
  MFC r273448:
  Fix the kernel panic in hostap mode.
  rvp->beacon_mbuf was NULL in run_update_beacon().
  
  PR:	189405
  Submitted by:	Gabor Simon <gabor.simon75 at gmail.com>

Modified:
  stable/10/sys/dev/usb/wlan/if_run.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/dev/usb/wlan/if_run.c
==============================================================================
--- stable/10/sys/dev/usb/wlan/if_run.c	Sat Oct 25 12:50:26 2014	(r273635)
+++ stable/10/sys/dev/usb/wlan/if_run.c	Sat Oct 25 15:06:09 2014	(r273636)
@@ -4911,6 +4911,12 @@ run_update_beacon(struct ieee80211vap *v
 	}
 
 	setbit(rvp->bo.bo_flags, item);
+	if (rvp->beacon_mbuf == NULL) {
+		rvp->beacon_mbuf = ieee80211_beacon_alloc(vap->iv_bss,
+		    &rvp->bo);
+		if (rvp->beacon_mbuf == NULL)
+			return;
+	}
 	ieee80211_beacon_update(vap->iv_bss, &rvp->bo, rvp->beacon_mbuf, mcast);
 
 	i = RUN_CMDQ_GET(&sc->cmdq_store);