|
@@ -608,12 +608,14 @@ static void rtw_add_network(struct adapter *adapter,
|
|
rtw_update_scanned_network(adapter, pnetwork);
|
|
rtw_update_scanned_network(adapter, pnetwork);
|
|
}
|
|
}
|
|
|
|
|
|
-/* select the desired network based on the capability of the (i)bss. */
|
|
|
|
-/* check items: (1) security */
|
|
|
|
-/* (2) network_type */
|
|
|
|
-/* (3) WMM */
|
|
|
|
-/* (4) HT */
|
|
|
|
-/* (5) others */
|
|
|
|
|
|
+/*
|
|
|
|
+ * select the desired network based on the capability of the (i)bss.
|
|
|
|
+ * check items: (1) security
|
|
|
|
+ * (2) network_type
|
|
|
|
+ * (3) WMM
|
|
|
|
+ * (4) HT
|
|
|
|
+ * (5) others
|
|
|
|
+ */
|
|
static int rtw_is_desired_network(struct adapter *adapter, struct wlan_network *pnetwork)
|
|
static int rtw_is_desired_network(struct adapter *adapter, struct wlan_network *pnetwork)
|
|
{
|
|
{
|
|
struct security_priv *psecuritypriv = &adapter->securitypriv;
|
|
struct security_priv *psecuritypriv = &adapter->securitypriv;
|
|
@@ -1006,9 +1008,12 @@ static struct sta_info *rtw_joinbss_update_stainfo(struct adapter *padapter, str
|
|
_rtw_memset((u8 *)&psta->dot11txpn, 0, sizeof(union pn48));
|
|
_rtw_memset((u8 *)&psta->dot11txpn, 0, sizeof(union pn48));
|
|
_rtw_memset((u8 *)&psta->dot11rxpn, 0, sizeof(union pn48));
|
|
_rtw_memset((u8 *)&psta->dot11rxpn, 0, sizeof(union pn48));
|
|
}
|
|
}
|
|
- /* Commented by Albert 2012/07/21 */
|
|
|
|
- /* When doing the WPS, the wps_ie_len won't equal to 0 */
|
|
|
|
- /* And the Wi-Fi driver shouldn't allow the data packet to be tramsmitted. */
|
|
|
|
|
|
+ /*
|
|
|
|
+ * Commented by Albert 2012/07/21
|
|
|
|
+ * When doing the WPS, the wps_ie_len won't equal to 0
|
|
|
|
+ * And the Wi-Fi driver shouldn't allow the data
|
|
|
|
+ * packet to be tramsmitted.
|
|
|
|
+ */
|
|
if (padapter->securitypriv.wps_ie_len != 0) {
|
|
if (padapter->securitypriv.wps_ie_len != 0) {
|
|
psta->ieee8021x_blocked = true;
|
|
psta->ieee8021x_blocked = true;
|
|
padapter->securitypriv.wps_ie_len = 0;
|
|
padapter->securitypriv.wps_ie_len = 0;
|
|
@@ -1820,17 +1825,15 @@ int rtw_restruct_wmm_ie(struct adapter *adapter, u8 *in_ie, u8 *out_ie, uint in_
|
|
return ielength;
|
|
return ielength;
|
|
}
|
|
}
|
|
|
|
|
|
-/* */
|
|
|
|
-/* Ported from 8185: IsInPreAuthKeyList(). (Renamed from SecIsInPreAuthKeyList(), 2006-10-13.) */
|
|
|
|
-/* Added by Annie, 2006-05-07. */
|
|
|
|
-/* */
|
|
|
|
-/* Search by BSSID, */
|
|
|
|
-/* Return Value: */
|
|
|
|
-/* -1 :if there is no pre-auth key in the table */
|
|
|
|
-/* >= 0 :if there is pre-auth key, and return the entry id */
|
|
|
|
-/* */
|
|
|
|
-/* */
|
|
|
|
-
|
|
|
|
|
|
+/*
|
|
|
|
+ * Ported from 8185: IsInPreAuthKeyList().
|
|
|
|
+ * (Renamed from SecIsInPreAuthKeyList(), 2006-10-13.)
|
|
|
|
+ * Added by Annie, 2006-05-07.
|
|
|
|
+ * Search by BSSID,
|
|
|
|
+ * Return Value:
|
|
|
|
+ * -1 :if there is no pre-auth key in the table
|
|
|
|
+ * >= 0 :if there is pre-auth key, and return the entry id
|
|
|
|
+ */
|
|
static int SecIsInPMKIDList(struct adapter *Adapter, u8 *bssid)
|
|
static int SecIsInPMKIDList(struct adapter *Adapter, u8 *bssid)
|
|
{
|
|
{
|
|
struct security_priv *psecuritypriv = &Adapter->securitypriv;
|
|
struct security_priv *psecuritypriv = &Adapter->securitypriv;
|