rtl8723ds: Fix builds for kernel 4.14

Signed-off-by: Alexander Kaplan <alex@nextthing.co>
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>

core/rtw_cmd.c

@@ -4638,6 +4638,4 @@ void rtw_getrttbl_cmd_cmdrsp_callback(_adapter	*padapter,  struct cmd_obj *pcmd)
 	if (padapter->registrypriv.mp_mode == 1)
 		padapter->mppriv.workparam.bcompleted = _TRUE;
 #endif
-
-
 }

core/rtw_mi.c

@@ -1067,7 +1067,7 @@ _adapter *rtw_get_iface_by_id(_adapter *padapter, u8 iface_id)
 	_adapter *iface = NULL;
 	struct dvobj_priv *dvobj = adapter_to_dvobj(padapter);
 
-	if ((padapter == NULL) || (iface_id >= CONFIG_IFACE_NUMBER)) {
+	if (iface_id >= CONFIG_IFACE_NUMBER) {
 		rtw_warn_on(1);
 		return iface;
 	}

core/rtw_mlme.c

@@ -2142,6 +2142,7 @@ void rtw_sta_media_status_rpt(_adapter *adapter, struct sta_info *sta, bool conn
 			role = H2C_MSR_ROLE_TDLS;
 		else
 #endif
+		{
 			if (MLME_IS_STA(adapter)) {
 				if (MLME_IS_GC(adapter))
 					role = H2C_MSR_ROLE_GO;
@@ -2156,25 +2157,24 @@ void rtw_sta_media_status_rpt(_adapter *adapter, struct sta_info *sta, bool conn
 				role = H2C_MSR_ROLE_ADHOC;
 
 #ifdef CONFIG_WFD
-		if (role == H2C_MSR_ROLE_GC
-		    || role == H2C_MSR_ROLE_GO
-		    || role == H2C_MSR_ROLE_TDLS
-		   ) {
-			if (adapter->wfd_info.rtsp_ctrlport
-			    || adapter->wfd_info.tdls_rtsp_ctrlport
-			    || adapter->wfd_info.peer_rtsp_ctrlport)
-				rtw_wfd_st_switch(sta, 1);
-		}
+			if (role == H2C_MSR_ROLE_GC || role == H2C_MSR_ROLE_GO ||
+			    role == H2C_MSR_ROLE_TDLS) {
+				if (adapter->wfd_info.rtsp_ctrlport ||
+				    adapter->wfd_info.tdls_rtsp_ctrlport ||
+				    adapter->wfd_info.peer_rtsp_ctrlport)
+					rtw_wfd_st_switch(sta, 1);
+			}
 #endif
-	}
+		}
 
-	rtw_hal_set_FwMediaStatusRpt_single_cmd(adapter
+		rtw_hal_set_FwMediaStatusRpt_single_cmd(adapter
 						, connected
 						, miracast_enabled
 						, miracast_sink
 						, role
 						, sta->mac_id
 					       );
+	}
 }
 
 u8 rtw_sta_media_status_rpt_cmd(_adapter *adapter, struct sta_info *sta, bool connected)

core/rtw_mp.c

@@ -836,7 +836,7 @@ u32 mp_join(PADAPTER padapter, u8 mode)
 		goto end_of_mp_start_test;
 	}
 	if (mode == WIFI_FW_ADHOC_STATE)
-	set_fwstate(pmlmepriv, WIFI_ADHOC_MASTER_STATE);
+		set_fwstate(pmlmepriv, WIFI_ADHOC_MASTER_STATE);
 	else
 		set_fwstate(pmlmepriv, WIFI_STATION_STATE);
 	/* 3 3. join psudo AdHoc */

core/rtw_p2p.c

@@ -2042,10 +2042,12 @@ u32 build_probe_resp_p2p_ie(struct wifidirect_info *pwdinfo, u8 *pbuf)
 			RTW_PUT_BE16(p2pie + p2pielen, pmlmepriv->p2p_sdt_scid[i]);
 			p2pielen += 2;
 		}
-	} else
+	} else {
 #endif /* CONFIG_INTEL_WIDI */
 		p2pie[p2pielen++] = 0x00;	/*	No Secondary Device Type List */
-
+#ifdef CONFIG_INTEL_WIDI
+	}
+#endif
 	/*	Device Name */
 	/*	Type: */
 	/* *(u16*) ( p2pie + p2pielen ) = cpu_to_be16( WPS_ATTR_DEVICE_NAME ); */

core/rtw_recv.c

@@ -3216,8 +3216,8 @@ void rtw_reordering_ctrl_timeout_handler(void *pcontext)
 
 	_enter_critical_bh(&ppending_recvframe_queue->lock, &irql);
 
-	if (preorder_ctrl)
-		preorder_ctrl->bReorderWaiting = _FALSE;
+//	if (preorder_ctrl)
+	preorder_ctrl->bReorderWaiting = _FALSE;
 
 	if (recv_indicatepkts_in_order(padapter, preorder_ctrl, _TRUE) == _TRUE)
 		_set_timer(&preorder_ctrl->reordering_ctrl_timer, REORDER_WAIT_TIME);

core/rtw_wlan_util.c

@@ -4673,7 +4673,11 @@ int rtw_dev_nlo_info_set(struct pno_nlo_info *nlo_info, pno_ssid_t *ssid,
 	source = rtw_zmalloc(2048);
 
 	if (source != NULL) {
-		len = vfs_read(fp, source, len, &pos);
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 14, 0))
+        len = kernel_read(fp, source, len, &pos);
+#else
+        len = vfs_read(fp, source, len, &pos);
+#endif
 		rtw_parse_cipher_list(nlo_info, source);
 		rtw_mfree(source, 2048);
 	}

core/rtw_xmit.c

@@ -3833,8 +3833,9 @@ s32 rtw_monitor_xmit_entry(struct sk_buff *skb, struct net_device *ndev)
 	struct ieee80211_radiotap_header *rtap_hdr;
 	_adapter *padapter = (_adapter *)rtw_netdev_priv(ndev);
 
-	if (skb)
-		rtw_mstat_update(MSTAT_TYPE_SKB, MSTAT_ALLOC_SUCCESS, skb->truesize);
+	if (!skb)
+		return 1;
+	rtw_mstat_update(MSTAT_TYPE_SKB, MSTAT_ALLOC_SUCCESS, skb->truesize);
 
 	if (unlikely(skb->len < sizeof(struct ieee80211_radiotap_header)))
 		goto fail;