diff --git a/drivers/net/wireless/marvell/mwifiex/cfg80211.c b/drivers/net/wireless/marvell/mwifiex/cfg80211.c
index 85b5df0..4431836 100644
--- a/drivers/net/wireless/marvell/mwifiex/cfg80211.c
+++ b/drivers/net/wireless/marvell/mwifiex/cfg80211.c
@@ -1388,7 +1388,7 @@
 			      int idx, u8 *mac, struct station_info *sinfo)
 {
 	struct mwifiex_private *priv = mwifiex_netdev_get_priv(dev);
-	static struct mwifiex_sta_node *node;
+	struct mwifiex_sta_node **node_p = &priv->dump_station_node;
 
 	if ((GET_BSS_ROLE(priv) == MWIFIEX_BSS_ROLE_STA) &&
 	    priv->media_connected && idx == 0) {
@@ -1398,15 +1398,15 @@
 		mwifiex_send_cmd(priv, HOST_CMD_APCMD_STA_LIST,
 				 HostCmd_ACT_GEN_GET, 0, NULL, true);
 
-		if (node && (&node->list == &priv->sta_list)) {
-			node = NULL;
+		if (*node_p && (&(*node_p)->list == &priv->sta_list)) {
+			*node_p = NULL;
 			return -ENOENT;
 		}
 
-		node = list_prepare_entry(node, &priv->sta_list, list);
-		list_for_each_entry_continue(node, &priv->sta_list, list) {
-			ether_addr_copy(mac, node->mac_addr);
-			return mwifiex_dump_station_info(priv, node, sinfo);
+		*node_p = list_prepare_entry((*node_p), &priv->sta_list, list);
+		list_for_each_entry_continue((*node_p), &priv->sta_list, list) {
+			ether_addr_copy(mac, (*node_p)->mac_addr);
+			return mwifiex_dump_station_info(priv, *node_p, sinfo);
 		}
 	}
 
diff --git a/drivers/net/wireless/marvell/mwifiex/main.h b/drivers/net/wireless/marvell/mwifiex/main.h
index 2f7f478..6d719fe 100644
--- a/drivers/net/wireless/marvell/mwifiex/main.h
+++ b/drivers/net/wireless/marvell/mwifiex/main.h
@@ -578,6 +578,7 @@
 	struct mwifiex_wmm_desc wmm;
 	atomic_t wmm_tx_pending[IEEE80211_NUM_ACS];
 	struct list_head sta_list;
+	struct mwifiex_sta_node *dump_station_node;
 	/* spin lock for associated station/TDLS peers list */
 	spinlock_t sta_list_spinlock;
 	struct list_head auto_tdls_list;