svn commit: r273636 - stable/10/sys/dev/usb/wlan

[Kevin Lo]

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);