1 --- rtl8812au_linux-master/os_dep/linux/ioctl_cfg80211.c.orig 2015-09-27 12:11:20.000000000 +0200
2 +++ rtl8812au_linux-master/os_dep/linux/ioctl_cfg80211.c 2015-09-27 13:53:42.644724720 +0200
6 if (!padapter->mlmepriv.not_indic_disco) {
7 - DBG_8192C("pwdev->sme_state(b)=%d\n", pwdev->sme_state);
9 - if(pwdev->sme_state==CFG80211_SME_CONNECTING)
10 + if (check_fwstate(pmlmepriv, WIFI_UNDER_LINKING)) {
11 cfg80211_connect_result(padapter->pnetdev, NULL, NULL, 0, NULL, 0,
12 WLAN_STATUS_UNSPECIFIED_FAILURE, GFP_ATOMIC/*GFP_KERNEL*/);
13 - else if(pwdev->sme_state==CFG80211_SME_CONNECTED)
15 +#if LINUX_VERSION_CODE < KERNEL_VERSION(4,2,0)
16 cfg80211_disconnected(padapter->pnetdev, 0, NULL, 0, GFP_ATOMIC);
18 - //DBG_8192C("pwdev->sme_state=%d\n", pwdev->sme_state);
20 - DBG_8192C("pwdev->sme_state(a)=%d\n", pwdev->sme_state);
22 + cfg80211_disconnected(padapter->pnetdev, 0, NULL, 0, false, GFP_ATOMIC);
25 + DBG_8192C("pwdev->sme_state(a)=%d\n", pwdev->sme_state);
29 --- rtl8812au_linux-master/hal/hal_com_phycfg.c.orig 2015-09-27 13:54:46.694957018 +0200
30 +++ rtl8812au_linux-master/hal/hal_com_phycfg.c 2015-09-27 13:57:14.855000882 +0200
32 #ifdef CONFIG_LOAD_PHY_PARA_FROM_FILE
34 extern char *rtw_phy_file_path;
35 -char file_path[PATH_LENGTH_MAX];
36 +char rtw_file_path[PATH_LENGTH_MAX];
38 #define GetLineFromBuffer(buffer) strsep(&buffer, "\n")
40 @@ -2597,11 +2597,11 @@
42 if ((pHalData->mac_reg_len == 0) && (pHalData->mac_reg == NULL))
44 - rtw_merge_string(file_path, PATH_LENGTH_MAX, rtw_phy_file_path, pFileName);
45 + rtw_merge_string(rtw_file_path, PATH_LENGTH_MAX, rtw_phy_file_path, pFileName);
47 - if (rtw_is_file_readable(file_path) == _TRUE)
48 + if (rtw_is_file_readable(rtw_file_path) == _TRUE)
50 - rlen = rtw_retrive_from_file(file_path, pHalData->para_file_buf, MAX_PARA_FILE_BUF_LEN);
51 + rlen = rtw_retrive_from_file(rtw_file_path, pHalData->para_file_buf, MAX_PARA_FILE_BUF_LEN);
55 @@ -2696,11 +2696,11 @@
57 if ((pBufLen != NULL) && (*pBufLen == 0) && (pBuf == NULL))
59 - rtw_merge_string(file_path, PATH_LENGTH_MAX, rtw_phy_file_path, pFileName);
60 + rtw_merge_string(rtw_file_path, PATH_LENGTH_MAX, rtw_phy_file_path, pFileName);
62 - if (rtw_is_file_readable(file_path) == _TRUE)
63 + if (rtw_is_file_readable(rtw_file_path) == _TRUE)
65 - rlen = rtw_retrive_from_file(file_path, pHalData->para_file_buf, MAX_PARA_FILE_BUF_LEN);
66 + rlen = rtw_retrive_from_file(rtw_file_path, pHalData->para_file_buf, MAX_PARA_FILE_BUF_LEN);
70 @@ -3149,11 +3149,11 @@
72 if ((pHalData->bb_phy_reg_pg_len == 0) && (pHalData->bb_phy_reg_pg == NULL))
74 - rtw_merge_string(file_path, PATH_LENGTH_MAX, rtw_phy_file_path, pFileName);
75 + rtw_merge_string(rtw_file_path, PATH_LENGTH_MAX, rtw_phy_file_path, pFileName);
77 - if (rtw_is_file_readable(file_path) == _TRUE)
78 + if (rtw_is_file_readable(rtw_file_path) == _TRUE)
80 - rlen = rtw_retrive_from_file(file_path, pHalData->para_file_buf, MAX_PARA_FILE_BUF_LEN);
81 + rlen = rtw_retrive_from_file(rtw_file_path, pHalData->para_file_buf, MAX_PARA_FILE_BUF_LEN);
85 @@ -3212,11 +3212,11 @@
87 if ((pHalData->bb_phy_reg_mp_len == 0) && (pHalData->bb_phy_reg_mp == NULL))
89 - rtw_merge_string(file_path, PATH_LENGTH_MAX, rtw_phy_file_path, pFileName);
90 + rtw_merge_string(rtw_file_path, PATH_LENGTH_MAX, rtw_phy_file_path, pFileName);
92 - if (rtw_is_file_readable(file_path) == _TRUE)
93 + if (rtw_is_file_readable(rtw_file_path) == _TRUE)
95 - rlen = rtw_retrive_from_file(file_path, pHalData->para_file_buf, MAX_PARA_FILE_BUF_LEN);
96 + rlen = rtw_retrive_from_file(rtw_file_path, pHalData->para_file_buf, MAX_PARA_FILE_BUF_LEN);
100 @@ -3348,11 +3348,11 @@
102 if ((pBufLen != NULL) && (*pBufLen == 0) && (pBuf == NULL))
104 - rtw_merge_string(file_path, PATH_LENGTH_MAX, rtw_phy_file_path, pFileName);
105 + rtw_merge_string(rtw_file_path, PATH_LENGTH_MAX, rtw_phy_file_path, pFileName);
107 - if (rtw_is_file_readable(file_path) == _TRUE)
108 + if (rtw_is_file_readable(rtw_file_path) == _TRUE)
110 - rlen = rtw_retrive_from_file(file_path, pHalData->para_file_buf, MAX_PARA_FILE_BUF_LEN);
111 + rlen = rtw_retrive_from_file(rtw_file_path, pHalData->para_file_buf, MAX_PARA_FILE_BUF_LEN);
115 @@ -3626,11 +3626,11 @@
117 if ((pHalData->rf_tx_pwr_track_len == 0) && (pHalData->rf_tx_pwr_track == NULL))
119 - rtw_merge_string(file_path, PATH_LENGTH_MAX, rtw_phy_file_path, pFileName);
120 + rtw_merge_string(rtw_file_path, PATH_LENGTH_MAX, rtw_phy_file_path, pFileName);
122 - if (rtw_is_file_readable(file_path) == _TRUE)
123 + if (rtw_is_file_readable(rtw_file_path) == _TRUE)
125 - rlen = rtw_retrive_from_file(file_path, pHalData->para_file_buf, MAX_PARA_FILE_BUF_LEN);
126 + rlen = rtw_retrive_from_file(rtw_file_path, pHalData->para_file_buf, MAX_PARA_FILE_BUF_LEN);
130 @@ -3995,11 +3995,11 @@
132 if ((pHalData->rf_tx_pwr_lmt_len == 0) && (pHalData->rf_tx_pwr_lmt == NULL))
134 - rtw_merge_string(file_path, PATH_LENGTH_MAX, rtw_phy_file_path, pFileName);
135 + rtw_merge_string(rtw_file_path, PATH_LENGTH_MAX, rtw_phy_file_path, pFileName);
137 - if (rtw_is_file_readable(file_path) == _TRUE)
138 + if (rtw_is_file_readable(rtw_file_path) == _TRUE)
140 - rlen = rtw_retrive_from_file(file_path, pHalData->para_file_buf, MAX_PARA_FILE_BUF_LEN);
141 + rlen = rtw_retrive_from_file(rtw_file_path, pHalData->para_file_buf, MAX_PARA_FILE_BUF_LEN);