diff options
| -rw-r--r-- | drivers/staging/ks7010/ks_wlan_net.c | 36 |
1 files changed, 13 insertions, 23 deletions
diff --git a/drivers/staging/ks7010/ks_wlan_net.c b/drivers/staging/ks7010/ks_wlan_net.c index f771b39..0852a1d 100644 --- a/drivers/staging/ks7010/ks_wlan_net.c +++ b/drivers/staging/ks7010/ks_wlan_net.c @@ -2036,10 +2036,8 @@ static int ks_wlan_set_pmksa(struct net_device *dev, list_for_each(ptr, &priv->pmklist.head) { pmk = list_entry(ptr, struct pmk_t, list); if (!memcmp(pmksa->bssid.sa_data, pmk->bssid, ETH_ALEN)) { /* match address! list move to head. */ - memcpy(pmk->pmkid, pmksa->pmkid, - IW_PMKID_LEN); - list_move(&pmk->list, - &priv->pmklist.head); + memcpy(pmk->pmkid, pmksa->pmkid, IW_PMKID_LEN); + list_move(&pmk->list, &priv->pmklist.head); break; /* list_for_each */ } } @@ -2049,28 +2047,20 @@ static int ks_wlan_set_pmksa(struct net_device *dev, if (priv->pmklist.size <= PMK_LIST_MAX) { /* new cache data */ for (i = 0; i < PMK_LIST_MAX; i++) { pmk = &priv->pmklist.pmk[i]; - if (!memcmp - ("\x00\x00\x00\x00\x00\x00", - pmk->bssid, ETH_ALEN)) - break; + if (!memcmp("\x00\x00\x00\x00\x00\x00", + pmk->bssid, ETH_ALEN)) + break; /* loop */ } - memcpy(pmk->bssid, pmksa->bssid.sa_data, - ETH_ALEN); - memcpy(pmk->pmkid, pmksa->pmkid, - IW_PMKID_LEN); - list_add(&pmk->list, - &priv->pmklist.head); + memcpy(pmk->bssid, pmksa->bssid.sa_data, ETH_ALEN); + memcpy(pmk->pmkid, pmksa->pmkid, IW_PMKID_LEN); + list_add(&pmk->list, &priv->pmklist.head); priv->pmklist.size++; } else { /* overwrite old cache data */ - pmk = - list_entry(priv->pmklist.head.prev, - struct pmk_t, list); - memcpy(pmk->bssid, pmksa->bssid.sa_data, - ETH_ALEN); - memcpy(pmk->pmkid, pmksa->pmkid, - IW_PMKID_LEN); - list_move(&pmk->list, - &priv->pmklist.head); + pmk = list_entry(priv->pmklist.head.prev, struct pmk_t, + list); + memcpy(pmk->bssid, pmksa->bssid.sa_data, ETH_ALEN); + memcpy(pmk->pmkid, pmksa->pmkid, IW_PMKID_LEN); + list_move(&pmk->list, &priv->pmklist.head); } break; case IW_PMKSA_REMOVE: |
