|
@@ -765,8 +765,8 @@ static int connect(struct wiphy *wiphy, struct net_device *dev,
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
|
|
- if ((sme->crypto.wpa_versions & NL80211_WPA_VERSION_1)
|
|
|
|
- || (sme->crypto.wpa_versions & NL80211_WPA_VERSION_2)) {
|
|
|
|
|
|
+ if ((sme->crypto.wpa_versions & NL80211_WPA_VERSION_1) ||
|
|
|
|
+ (sme->crypto.wpa_versions & NL80211_WPA_VERSION_2)) {
|
|
for (i = 0; i < sme->crypto.n_ciphers_pairwise; i++) {
|
|
for (i = 0; i < sme->crypto.n_ciphers_pairwise; i++) {
|
|
if (sme->crypto.ciphers_pairwise[i] == WLAN_CIPHER_SUITE_TKIP)
|
|
if (sme->crypto.ciphers_pairwise[i] == WLAN_CIPHER_SUITE_TKIP)
|
|
u8security = u8security | TKIP;
|
|
u8security = u8security | TKIP;
|
|
@@ -1497,8 +1497,8 @@ void WILC_WFI_p2p_rx(struct net_device *dev, u8 *buff, u32 size)
|
|
}
|
|
}
|
|
}
|
|
}
|
|
if (p2p_local_random > p2p_recv_random) {
|
|
if (p2p_local_random > p2p_recv_random) {
|
|
- if ((buff[P2P_PUB_ACTION_SUBTYPE] == GO_NEG_REQ || buff[P2P_PUB_ACTION_SUBTYPE] == GO_NEG_RSP
|
|
|
|
- || buff[P2P_PUB_ACTION_SUBTYPE] == P2P_INV_REQ || buff[P2P_PUB_ACTION_SUBTYPE] == P2P_INV_RSP)) {
|
|
|
|
|
|
+ if ((buff[P2P_PUB_ACTION_SUBTYPE] == GO_NEG_REQ || buff[P2P_PUB_ACTION_SUBTYPE] == GO_NEG_RSP ||
|
|
|
|
+ buff[P2P_PUB_ACTION_SUBTYPE] == P2P_INV_REQ || buff[P2P_PUB_ACTION_SUBTYPE] == P2P_INV_RSP)) {
|
|
for (i = P2P_PUB_ACTION_SUBTYPE + 2; i < size; i++) {
|
|
for (i = P2P_PUB_ACTION_SUBTYPE + 2; i < size; i++) {
|
|
if (buff[i] == P2PELEM_ATTR_ID && !(memcmp(p2p_oui, &buff[i + 2], 4))) {
|
|
if (buff[i] == P2PELEM_ATTR_ID && !(memcmp(p2p_oui, &buff[i + 2], 4))) {
|
|
WILC_WFI_CfgParseRxAction(&buff[i + 6], size - (i + 6));
|
|
WILC_WFI_CfgParseRxAction(&buff[i + 6], size - (i + 6));
|
|
@@ -1682,8 +1682,8 @@ static int mgmt_tx(struct wiphy *wiphy,
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
|
|
- if ((buf[P2P_PUB_ACTION_SUBTYPE] == GO_NEG_REQ || buf[P2P_PUB_ACTION_SUBTYPE] == GO_NEG_RSP
|
|
|
|
- || buf[P2P_PUB_ACTION_SUBTYPE] == P2P_INV_REQ || buf[P2P_PUB_ACTION_SUBTYPE] == P2P_INV_RSP)) {
|
|
|
|
|
|
+ if ((buf[P2P_PUB_ACTION_SUBTYPE] == GO_NEG_REQ || buf[P2P_PUB_ACTION_SUBTYPE] == GO_NEG_RSP ||
|
|
|
|
+ buf[P2P_PUB_ACTION_SUBTYPE] == P2P_INV_REQ || buf[P2P_PUB_ACTION_SUBTYPE] == P2P_INV_RSP)) {
|
|
if (p2p_local_random > p2p_recv_random) {
|
|
if (p2p_local_random > p2p_recv_random) {
|
|
for (i = P2P_PUB_ACTION_SUBTYPE + 2; i < len; i++) {
|
|
for (i = P2P_PUB_ACTION_SUBTYPE + 2; i < len; i++) {
|
|
if (buf[i] == P2PELEM_ATTR_ID && !(memcmp(p2p_oui, &buf[i + 2], 4))) {
|
|
if (buf[i] == P2PELEM_ATTR_ID && !(memcmp(p2p_oui, &buf[i + 2], 4))) {
|