staging: wilc1000: remove typedef from tstrHostIFpmkidAttr

This patch removes typedef from the struct tstrHostIFpmkidAttr.
And rename it to host_if_pmkid_attr.

Signed-off-by: Leo Kim <leo.kim@atmel.com>
Signed-off-by: Tony Cho <tony.cho@atmel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/wilc1000/host_interface.c b/drivers/staging/wilc1000/host_interface.c
index 33988117d78762b1f3bbcde0b1643db5238b55d6..50426bfc008bee97dc9ed2fc033d0eefbec65f9c 100644 (file)
--- a/drivers/staging/wilc1000/host_interface.c
+++ b/drivers/staging/wilc1000/host_interface.c
@@ -127,7 +127,7 @@ struct host_if_wep_attr {
 union host_if_key_attr {
        struct host_if_wep_attr strHostIFwepAttr;
        struct host_if_wpa_attr strHostIFwpaAttr;
-       tstrHostIFpmkidAttr strHostIFpmkidAttr;
+       struct host_if_pmkid_attr strHostIFpmkidAttr;
 };
 
 /*!
@@ -4725,7 +4725,7 @@ s32 host_int_add_rx_gtk(tstrWILC_WFIDrv *hWFIDrv, const u8 *pu8RxGtk, u8 u8GtkKe
  *  @date              8 March 2012
  *  @version           1.0
  */
-s32 host_int_set_pmkid_info(tstrWILC_WFIDrv *hWFIDrv, tstrHostIFpmkidAttr *pu8PmkidInfoArray)
+s32 host_int_set_pmkid_info(tstrWILC_WFIDrv *hWFIDrv, struct host_if_pmkid_attr *pu8PmkidInfoArray)
 {
        s32 s32Error = 0;
        tstrWILC_WFIDrv *pstrWFIDrv = (tstrWILC_WFIDrv *)hWFIDrv;

diff --git a/drivers/staging/wilc1000/host_interface.h b/drivers/staging/wilc1000/host_interface.h
index 856cab0865636608a349b64cba31494904b67eae..e9a97150e07c7ecf805b2c95f6fc556f3fc94329 100644 (file)
--- a/drivers/staging/wilc1000/host_interface.h
+++ b/drivers/staging/wilc1000/host_interface.h
@@ -88,10 +88,10 @@ typedef struct _tstrHostIFpmkid {
        u8 pmkid[PMKID_LEN];
 } tstrHostIFpmkid;
 
-typedef struct _tstrHostIFpmkidAttr {
+struct host_if_pmkid_attr {
        u8 numpmkid;
        tstrHostIFpmkid pmkidlist[WILC_MAX_NUM_PMKIDS];
-} tstrHostIFpmkidAttr;
+};
 
 typedef enum {
        AUTORATE        = 0,
@@ -550,7 +550,7 @@ s32 host_int_add_tx_gtk(tstrWILC_WFIDrv *hWFIDrv, u8 u8KeyLen, u8 *pu8TxGtk, u8
  *  @version           1.0
  */
 
-s32 host_int_set_pmkid_info(tstrWILC_WFIDrv *hWFIDrv, tstrHostIFpmkidAttr *pu8PmkidInfoArray);
+s32 host_int_set_pmkid_info(tstrWILC_WFIDrv *hWFIDrv, struct host_if_pmkid_attr *pu8PmkidInfoArray);
 /**
  *  @brief              gets the cached the pmkid info
  *  @details    valid only in BSS STA mode if External Supplicant

diff --git a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
index 788cfaa661ecd32bea24744d1f5bb9e5d831ca12..eac77ce3cd0d580a30eadb29a06445fe42ced331 100644 (file)
--- a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
+++ b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
@@ -1924,7 +1924,7 @@ static int flush_pmksa(struct wiphy *wiphy, struct net_device *netdev)
        PRINT_D(CFG80211_DBG,  "Flushing  PMKID key values\n");
 
        /*Get cashed Pmkids and set all with zeros*/
-       memset(&priv->pmkid_list, 0, sizeof(tstrHostIFpmkidAttr));
+       memset(&priv->pmkid_list, 0, sizeof(struct host_if_pmkid_attr));
 
        return 0;
 }

diff --git a/drivers/staging/wilc1000/wilc_wfi_netdevice.h b/drivers/staging/wilc1000/wilc_wfi_netdevice.h
index d25092dccd4a6c574b0ed99763eea582b8183fb7..cb21968c08731523cdf24e14e3575a5d2e03684b 100644 (file)
--- a/drivers/staging/wilc1000/wilc_wfi_netdevice.h
+++ b/drivers/staging/wilc1000/wilc_wfi_netdevice.h
@@ -122,7 +122,7 @@ struct wilc_priv {
        struct net_device *dev;
        struct napi_struct napi;
        tstrWILC_WFIDrv *hWILCWFIDrv;
-       tstrHostIFpmkidAttr pmkid_list;
+       struct host_if_pmkid_attr pmkid_list;
        struct WILC_WFI_stats netstats;
        u8 WILC_WFI_wep_default;
        u8 WILC_WFI_wep_key[4][WLAN_KEY_LEN_WEP104];