From 3a75759ecf96fc4e135a9d7e6457ab156fc06350 Mon Sep 17 00:00:00 2001
From: kimocoder <christian@aircrack-ng.org>
Date: Sat, 17 Aug 2019 00:07:45 +0200
Subject: [PATCH] a little sta_alloc fix

---
 core/efuse/rtw_efuse.c |  2 +-
 core/rtw_sta_mgt.c     |  8 ++++++--
 macid-error.patch      | 11 -----------
 3 files changed, 7 insertions(+), 14 deletions(-)
 delete mode 100644 macid-error.patch

diff --git a/core/efuse/rtw_efuse.c b/core/efuse/rtw_efuse.c
index 44d8ac4..7259677 100644
--- a/core/efuse/rtw_efuse.c
+++ b/core/efuse/rtw_efuse.c
@@ -1035,7 +1035,7 @@ u8 rtw_efuse_bt_access(PADAPTER adapter, u8 write, u16 addr, u16 cnts, u8 *data)
 
 		if (efuse) {
 			err = rtw_halmac_read_bt_physical_efuse_map(d, efuse, size);
-			
+
 			if (err == -1) {
 				RTW_ERR("%s: rtw_halmac_read_bt_physical_efuse_map fail!\n", __FUNCTION__);
 				rtw_mfree(efuse, size);
diff --git a/core/rtw_sta_mgt.c b/core/rtw_sta_mgt.c
index f4fbdb4..cbf096d 100644
--- a/core/rtw_sta_mgt.c
+++ b/core/rtw_sta_mgt.c
@@ -512,9 +512,13 @@ struct	sta_info *rtw_alloc_stainfo(struct	sta_priv *pstapriv, const u8 *hwaddr)
 
 	/* _enter_critical_bh(&(pfree_sta_queue->lock), &irqL); */
 	_enter_critical_bh(&(pstapriv->sta_hash_lock), &irqL2);
-	if (_rtw_queue_empty(pfree_sta_queue) == _TRUE) {
+	if (!pstapriv->padapter->pnetdev)
+	{
+		psta = NULL;
+	}
+	else if (_rtw_queue_empty(pfree_sta_queue) == _TRUE)
 		/* _exit_critical_bh(&(pfree_sta_queue->lock), &irqL); */
-		_exit_critical_bh(&(pstapriv->sta_hash_lock), &irqL2);
+		/* _exit_critical_bh(&(pstapriv->sta_hash_lock), &irqL2); */
 		psta = NULL;
 	} else {
 		psta = LIST_CONTAINOR(get_next(&pfree_sta_queue->queue), struct sta_info, list);
diff --git a/macid-error.patch b/macid-error.patch
deleted file mode 100644
index 80d2a58..0000000
--- a/macid-error.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/core/rtw_mlme_ext.c
-+++ b/core/rtw_mlme_ext.c
-@@ -11636,7 +11636,7 @@ static void rtw_mlmeext_disconnect(_adap
- 
- 	//set_opmode_cmd(padapter, infra_client_with_mlme);
- 
--#if 1
-+#if 0 // this check always causes a failure with an invalid macid error message in the logs
- 	/*
- 	 * For safety, prevent from keeping macid sleep.
- 	 * If we can sure all power mode enter/leave are paired,