OSDN Git Service

staging: ks7010: refactor, whitespace only
authorTobin C. Harding <me@tobin.cc>
Mon, 13 Mar 2017 22:54:10 +0000 (09:54 +1100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 14 Mar 2017 00:08:15 +0000 (08:08 +0800)
Code may be refactored to take advantage of previous patches which
reduced the level of indentation. Function parameter line breaks can
be adjusted in line with kernel coding standards.

Refactor layout of function call parameters. Make whitespace changes
only.

Signed-off-by: Tobin C. Harding <me@tobin.cc>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/ks7010/ks_wlan_net.c

index f771b39..0852a1d 100644 (file)
@@ -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: