More ifup/ifdown fixes

linux_kernel_modules/mt7697wifi/cfg80211.c

@@ -1007,7 +1007,7 @@ int mt7697_cfg80211_stop(struct mt7697_vif *vif)
 			print_hex_dump(KERN_DEBUG, DRVNAME" DISCONNECT STA BSSID ", 
 				DUMP_PREFIX_OFFSET, 16, 1, sta->bssid, ETH_ALEN, 0);
 
-			ret = mt7697_wr_disconnect_req(vif->cfg, vif->fw_vif_idx, sta->bssid);
+			ret = mt7697_wr_disconnect_req(vif->cfg, sta->bssid);
 			if (ret < 0) {
 				dev_err(vif->cfg->dev, 
 					"%s(): mt7697_wr_disconnect_req() failed(%d)\n", 
@@ -1240,7 +1240,7 @@ int mt7697_cfg80211_del_sta(struct mt7697_vif *vif, const u8* bssid)
 			print_hex_dump(KERN_DEBUG, DRVNAME" DISCONNECT STA BSSID ", 
 				DUMP_PREFIX_OFFSET, 16, 1, sta->bssid, ETH_ALEN, 0);
 
-			ret = mt7697_wr_disconnect_req(vif->cfg, vif->fw_vif_idx, sta->bssid);
+			ret = mt7697_wr_disconnect_req(vif->cfg, sta->bssid);
 			if (ret < 0) {
 				dev_err(vif->cfg->dev, 
 					"%s(): mt7697_wr_disconnect_req() failed(%d)\n", 

linux_kernel_modules/mt7697wifi/main.c

@@ -324,8 +324,7 @@ int mt7697_disconnect(struct mt7697_vif *vif)
 				      	      NULL, 0, GFP_KERNEL);
 		}
 
-		ret = mt7697_wr_disconnect_req(vif->cfg, vif->fw_vif_idx, 
-			NULL);
+		ret = mt7697_wr_disconnect_req(vif->cfg, NULL);
 		if (ret < 0) {
 			dev_err(vif->cfg->dev, 
 				"%s(): mt7697_wr_disconnect_req() failed(%d)\n", 

linux_kernel_modules/mt7697wifi/wmi.c

@@ -699,13 +699,30 @@ static int mt7697_proc_disconnect_ind(struct mt7697_cfg80211_info *cfg)
 		}
 
 		dev_dbg(cfg->dev, "%s(): vif(%u)\n", __func__, vif->fw_vif_idx);
-		if (vif->sme_state == SME_CONNECTING)
+		if (vif->sme_state == SME_CONNECTING) {
+			ret = mt7697_wr_disconnect_req(vif->cfg, bssid);
+			if (ret < 0) {
+				dev_err(vif->cfg->dev, 
+					"%s(): mt7697_wr_disconnect_req() failed(%d)\n", 
+					__func__, ret);
+				goto cleanup;
+			}
+
 			cfg80211_connect_result(vif->ndev, bssid, 
 						NULL, 0,
 						NULL, 0,
 						WLAN_STATUS_UNSPECIFIED_FAILURE,
 						GFP_KERNEL);
+		}
 		else if (vif->sme_state == SME_CONNECTED) {
+			ret = mt7697_wr_disconnect_req(vif->cfg, bssid);
+			if (ret < 0) {
+				dev_err(vif->cfg->dev, 
+					"%s(): mt7697_wr_disconnect_req() failed(%d)\n", 
+					__func__, ret);
+				goto cleanup;
+			}
+
 			cfg80211_disconnected(vif->ndev, proto_reason,
 				      	      NULL, 0, GFP_KERNEL);
 		}
@@ -779,6 +796,11 @@ static int mt7697_rx_raw(const struct mt7697q_rsp_hdr* rsp,
 	print_hex_dump(KERN_DEBUG, DRVNAME" RX ", DUMP_PREFIX_OFFSET, 
 		16, 1, cfg->rx_data, rsp->result, 0);
 
+	if (list_empty(&cfg->vif_list)) {
+		dev_dbg(cfg->dev, "%s(): no interfaces\n", __func__);
+       		goto cleanup;
+	}
+
 	/* TODO: interface index come from MT7697 */
 	ret = mt7697_rx_data(cfg, rsp->result, 0);
 	if (ret) {
@@ -1485,7 +1507,7 @@ cleanup:
 }
 
 int mt7697_wr_disconnect_req(const struct mt7697_cfg80211_info *cfg, 
-                             u32 if_idx, const u8 *addr)
+                             const u8 *addr)
 {
 	struct mt7697_disconnect_req req;
 	int ret;
@@ -1494,7 +1516,6 @@ int mt7697_wr_disconnect_req(const struct mt7697_cfg80211_info *cfg,
 	req.cmd.len = sizeof(struct mt7697_disconnect_req);
 	req.cmd.grp = MT7697_CMD_GRP_80211;
 	req.cmd.type = MT7697_CMD_DISCONNECT_REQ;
-	req.if_idx = if_idx;
 
 	if (addr) {
 		req.port = MT7697_PORT_AP;

linux_kernel_modules/mt7697wifi/wmi.h

@@ -253,7 +253,6 @@ struct mt7697_connect_ind {
 
 struct mt7697_disconnect_req {
 	struct mt7697q_cmd_hdr		cmd;
-	__be32 				if_idx;
 	__be32				port;
 	u8				addr[LEN32_ALIGNED(ETH_ALEN)];
 } __attribute__((packed, aligned(4)));
@@ -295,7 +294,7 @@ int mt7697_wr_scan_req(const struct mt7697_cfg80211_info*, u32,
 int mt7697_wr_set_security_mode_req(const struct mt7697_cfg80211_info*, u8, u8);
 int mt7697_wr_get_security_mode_req(const struct mt7697_cfg80211_info*, u32);
 int mt7697_wr_scan_stop_req(const struct mt7697_cfg80211_info*); 
-int mt7697_wr_disconnect_req(const struct mt7697_cfg80211_info*, u32, const u8*);
+int mt7697_wr_disconnect_req(const struct mt7697_cfg80211_info*, const u8*);
 int mt7697_wr_tx_raw_packet(struct mt7697_cfg80211_info*, const u8*, u32);
 int mt7697_proc_data(void*);