diff --git a/core/rtw_sta_mgt.c b/core/rtw_sta_mgt.c
index 69d63b0..3a79e09 100644
--- a/core/rtw_sta_mgt.c
+++ b/core/rtw_sta_mgt.c
@@ -775,8 +775,8 @@ u32	rtw_free_stainfo(_adapter *padapter , struct sta_info *psta)
 			pstapriv->sta_aid[psta->cmn.aid - 1] = NULL;
 			psta->cmn.aid = 0;
 		}
-		if (psta->aid > 31) {
-			pr_err("***** psta->aid (%d) out of bounds\n", psta->aid);
+		if (psta->cmn.aid > 31) {
+			pr_err("***** psta->aid (%d) out of bounds\n", psta->cmn.aid);
 			return _FAIL;
 		}
 	}
diff --git a/os_dep/linux/os_intfs.c b/os_dep/linux/os_intfs.c
index ad8553d..f5a124c 100644
--- a/os_dep/linux/os_intfs.c
+++ b/os_dep/linux/os_intfs.c
@@ -1300,15 +1300,16 @@ static u16 rtw_select_queue(struct net_device *dev, struct sk_buff *skb,
 static u16 rtw_select_queue(struct net_device *dev, struct sk_buff *skb,
 			    void *accel_priv, select_queue_fallback_t fallback)
 #endif
-static u16 rtw_select_queue(struct net_device *dev, struct sk_buff *skb
 {
 	_adapter	*padapter = rtw_netdev_priv(dev);
 	struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
 
 	skb->priority = rtw_classify8021d(skb);
 
-	if (pmlmepriv->acm_mask != 0)
+	if(pmlmepriv->acm_mask != 0)
+	{
 		skb->priority = qos_acm(pmlmepriv->acm_mask, skb->priority);
+	}
 
 	return rtw_1d_to_queue[skb->priority];
 }
@@ -1676,10 +1677,6 @@ void rtw_os_ndev_unregister(_adapter *adapter)
 #endif
 
 	if ((adapter->DriverState != DRIVER_DISAPPEAR) && netdev) {
-#ifdef CONFIG_IOCTL_CFG80211
-		struct wireless_dev *wdev = padapter->rtw_wdev;
-		wdev->current_bss = NULL;
-#endif
 		struct dvobj_priv *dvobj = adapter_to_dvobj(adapter);
 		u8 rtnl_lock_needed = rtw_rtnl_lock_needed(dvobj);
 
@@ -3557,11 +3554,11 @@ static int netdev_close(struct net_device *pnetdev)
 #endif /* CONFIG_P2P */
 
 #ifdef CONFIG_IOCTL_CFG80211
-	wdev->iftype = NL80211_IFTYPE_STATION;
+	//wdev->iftype = NL80211_IFTYPE_STATION;
 	rtw_scan_abort(padapter);
 	rtw_cfg80211_wait_scan_req_empty(padapter, 200);
 	adapter_wdev_data(padapter)->bandroid_scan = _FALSE;
-	padapter->rtw_wdev->iftype = NL80211_IFTYPE_STATION; /* set this at the end */
+	//padapter->rtw_wdev->iftype = NL80211_IFTYPE_STATION; /* set this at the end */
 #endif /* CONFIG_IOCTL_CFG80211 */
 
 #ifdef CONFIG_WAPI_SUPPORT