From b74024743e2530d0fe10b2e4cc6754c8c5af2be5 Mon Sep 17 00:00:00 2001 From: Quytelda Kahja Date: Fri, 30 Mar 2018 23:08:45 -0700 Subject: [PATCH] staging: ks7010: Remove trailing _t from 'struct pmk_t'. The "_t" suffix is not needed for structure names in this driver, and is a reflection of an older typedef system that is no longer in place. Replace all occurences of 'struct pmk_t' with 'struct pmk'. Signed-off-by: Quytelda Kahja Signed-off-by: Greg Kroah-Hartman --- drivers/staging/ks7010/ks_hostif.c | 2 +- drivers/staging/ks7010/ks_wlan.h | 2 +- drivers/staging/ks7010/ks_wlan_net.c | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/drivers/staging/ks7010/ks_hostif.c b/drivers/staging/ks7010/ks_hostif.c index 85b9e26..42f1cd8 100644 --- a/drivers/staging/ks7010/ks_hostif.c +++ b/drivers/staging/ks7010/ks_hostif.c @@ -2130,7 +2130,7 @@ void hostif_sme_set_pmksa(struct ks_wlan_private *priv) u8 pmkid[IW_PMKID_LEN]; } __packed list[PMK_LIST_MAX]; } __packed pmkcache; - struct pmk_t *pmk; + struct pmk *pmk; int i; i = 0; diff --git a/drivers/staging/ks7010/ks_wlan.h b/drivers/staging/ks7010/ks_wlan.h index 69eac00..20b5845 100644 --- a/drivers/staging/ks7010/ks_wlan.h +++ b/drivers/staging/ks7010/ks_wlan.h @@ -383,7 +383,7 @@ struct wpa_status { struct pmk_list { u16 size; struct list_head head; - struct pmk_t { + struct pmk { struct list_head list; u8 bssid[ETH_ALEN]; u8 pmkid[IW_PMKID_LEN]; diff --git a/drivers/staging/ks7010/ks_wlan_net.c b/drivers/staging/ks7010/ks_wlan_net.c index 1b82347..72a52c6 100644 --- a/drivers/staging/ks7010/ks_wlan_net.c +++ b/drivers/staging/ks7010/ks_wlan_net.c @@ -1818,7 +1818,7 @@ static int ks_wlan_set_pmksa(struct net_device *dev, struct ks_wlan_private *priv = netdev_priv(dev); struct iw_pmksa *pmksa; int i; - struct pmk_t *pmk; + struct pmk *pmk; struct list_head *ptr; if (priv->sleep_mode == SLP_SLEEP) @@ -1847,7 +1847,7 @@ static int ks_wlan_set_pmksa(struct net_device *dev, } /* search cache data */ list_for_each(ptr, &priv->pmklist.head) { - pmk = list_entry(ptr, struct pmk_t, list); + pmk = list_entry(ptr, struct pmk, list); if (memcmp(pmksa->bssid.sa_data, pmk->bssid, ETH_ALEN) == 0) { memcpy(pmk->pmkid, pmksa->pmkid, IW_PMKID_LEN); list_move(&pmk->list, &priv->pmklist.head); @@ -1869,7 +1869,7 @@ static int ks_wlan_set_pmksa(struct net_device *dev, 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, + pmk = list_entry(priv->pmklist.head.prev, struct pmk, list); memcpy(pmk->bssid, pmksa->bssid.sa_data, ETH_ALEN); memcpy(pmk->pmkid, pmksa->pmkid, IW_PMKID_LEN); @@ -1882,7 +1882,7 @@ static int ks_wlan_set_pmksa(struct net_device *dev, } /* search cache data */ list_for_each(ptr, &priv->pmklist.head) { - pmk = list_entry(ptr, struct pmk_t, list); + pmk = list_entry(ptr, struct pmk, list); if (memcmp(pmksa->bssid.sa_data, pmk->bssid, ETH_ALEN) == 0) { eth_zero_addr(pmk->bssid); memset(pmk->pmkid, 0, IW_PMKID_LEN); -- 2.7.4