Merge tag 'staging-4.12-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh...

[karo-tx-linux.git] / drivers / staging / wilc1000 / wilc_wfi_cfgoperations.c

diff --git a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
index 2b4536318ca62b6bb464c2c16dcde34b6540e0c0..44a12bdd6a46d25bc2c90cdbaaf7223c8daefe38 100644 (file)
--- a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
+++ b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
@@ -29,8 +29,8 @@
 #define P2P_INV_REQ                    0x03
 #define P2P_INV_RSP                    0x04
 #define PUBLIC_ACT_VENDORSPEC          0x09
-#define GAS_INTIAL_REQ                 0x0a
-#define GAS_INTIAL_RSP                 0x0b
+#define GAS_INITIAL_REQ                        0x0a
+#define GAS_INITIAL_RSP                        0x0b
 
 #define INVALID_CHANNEL                        0
 
@@ -205,11 +205,11 @@ static u32 get_rssi_avg(struct network_info *network_info)
 {
        u8 i;
        int rssi_v = 0;
-       u8 num_rssi = (network_info->str_rssi.u8Full) ?
-                      NUM_RSSI : (network_info->str_rssi.u8Index);
+       u8 num_rssi = (network_info->rssi_history.full) ?
+                      NUM_RSSI : (network_info->rssi_history.index);
 
        for (i = 0; i < num_rssi; i++)
-               rssi_v += network_info->str_rssi.as8RSSI[i];
+               rssi_v += network_info->rssi_history.samples[i];
 
        rssi_v /= num_rssi;
        return rssi_v;
@@ -346,13 +346,13 @@ static void add_network_to_shadow(struct network_info *pstrNetworkInfo,
        } else {
                ap_index = ap_found;
        }
-       rssi_index = last_scanned_shadow[ap_index].str_rssi.u8Index;
-       last_scanned_shadow[ap_index].str_rssi.as8RSSI[rssi_index++] = pstrNetworkInfo->rssi;
+       rssi_index = last_scanned_shadow[ap_index].rssi_history.index;
+       last_scanned_shadow[ap_index].rssi_history.samples[rssi_index++] = pstrNetworkInfo->rssi;
        if (rssi_index == NUM_RSSI) {
                rssi_index = 0;
-               last_scanned_shadow[ap_index].str_rssi.u8Full = 1;
+               last_scanned_shadow[ap_index].rssi_history.full = true;
        }
-       last_scanned_shadow[ap_index].str_rssi.u8Index = rssi_index;
+       last_scanned_shadow[ap_index].rssi_history.index = rssi_index;
        last_scanned_shadow[ap_index].rssi = pstrNetworkInfo->rssi;
        last_scanned_shadow[ap_index].cap_info = pstrNetworkInfo->cap_info;
        last_scanned_shadow[ap_index].ssid_len = pstrNetworkInfo->ssid_len;
@@ -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++) {
                        if (sme->crypto.ciphers_pairwise[i] == WLAN_CIPHER_SUITE_TKIP)
                                u8security = u8security | TKIP;
@@ -1301,16 +1301,16 @@ static int set_pmksa(struct wiphy *wiphy, struct net_device *netdev,
 
        for (i = 0; i < priv->pmkid_list.numpmkid; i++) {
                if (!memcmp(pmksa->bssid, priv->pmkid_list.pmkidlist[i].bssid,
-                                ETH_ALEN)) {
+                           ETH_ALEN)) {
                        flag = PMKID_FOUND;
                        break;
                }
        }
        if (i < WILC_MAX_NUM_PMKIDS) {
                memcpy(priv->pmkid_list.pmkidlist[i].bssid, pmksa->bssid,
-                           ETH_ALEN);
+                      ETH_ALEN);
                memcpy(priv->pmkid_list.pmkidlist[i].pmkid, pmksa->pmkid,
-                           PMKID_LEN);
+                      PMKID_LEN);
                if (!(flag == PMKID_FOUND))
                        priv->pmkid_list.numpmkid++;
        } else {
@@ -1334,7 +1334,7 @@ static int del_pmksa(struct wiphy *wiphy, struct net_device *netdev,
 
        for (i = 0; i < priv->pmkid_list.numpmkid; i++) {
                if (!memcmp(pmksa->bssid, priv->pmkid_list.pmkidlist[i].bssid,
-                                ETH_ALEN)) {
+                           ETH_ALEN)) {
                        memset(&priv->pmkid_list.pmkidlist[i], 0, sizeof(struct host_if_pmkid));
                        break;
                }
@@ -1343,11 +1343,11 @@ static int del_pmksa(struct wiphy *wiphy, struct net_device *netdev,
        if (i < priv->pmkid_list.numpmkid && priv->pmkid_list.numpmkid > 0) {
                for (; i < (priv->pmkid_list.numpmkid - 1); i++) {
                        memcpy(priv->pmkid_list.pmkidlist[i].bssid,
-                                   priv->pmkid_list.pmkidlist[i + 1].bssid,
-                                   ETH_ALEN);
+                              priv->pmkid_list.pmkidlist[i + 1].bssid,
+                              ETH_ALEN);
                        memcpy(priv->pmkid_list.pmkidlist[i].pmkid,
-                                   priv->pmkid_list.pmkidlist[i].pmkid,
-                                   PMKID_LEN);
+                              priv->pmkid_list.pmkidlist[i + 1].pmkid,
+                              PMKID_LEN);
                }
                priv->pmkid_list.numpmkid--;
        } else {
@@ -1477,10 +1477,10 @@ void WILC_WFI_p2p_rx(struct net_device *dev, u8 *buff, u32 size)
                        }
                        if (buff[ACTION_CAT_ID] == PUB_ACTION_ATTR_ID) {
                                switch (buff[ACTION_SUBTYPE_ID]) {
-                               case GAS_INTIAL_REQ:
+                               case GAS_INITIAL_REQ:
                                        break;
 
-                               case GAS_INTIAL_RSP:
+                               case GAS_INITIAL_RSP:
                                        break;
 
                                case PUBLIC_ACT_VENDORSPEC:
@@ -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 ((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++) {
                                                                        if (buff[i] == P2PELEM_ATTR_ID && !(memcmp(p2p_oui, &buff[i + 2], 4))) {
                                                                                WILC_WFI_CfgParseRxAction(&buff[i + 6], size - (i + 6));
@@ -1666,10 +1666,10 @@ static int mgmt_tx(struct wiphy *wiphy,
                                        curr_channel = chan->hw_value;
                                }
                                switch (buf[ACTION_SUBTYPE_ID]) {
-                               case GAS_INTIAL_REQ:
+                               case GAS_INITIAL_REQ:
                                        break;
 
-                               case GAS_INTIAL_RSP:
+                               case GAS_INITIAL_RSP:
                                        break;
 
                                case PUBLIC_ACT_VENDORSPEC:
@@ -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) {
                                                                for (i = P2P_PUB_ACTION_SUBTYPE + 2; i < len; i++) {
                                                                        if (buf[i] == P2PELEM_ATTR_ID && !(memcmp(p2p_oui, &buf[i + 2], 4))) {