From 5ea0448047ce05da0ee10775510a581b5f71cc82 Mon Sep 17 00:00:00 2001 From: Larry Finger Date: Mon, 18 Jul 2011 22:09:44 -0500 Subject: [PATCH] staging: rtl8192e: Convert typedef SW_CAM_TABLE to struct sw_cam_table Remove typedef from struct. Rename struct. Rename uses. Signed-off-by: Larry Finger --- drivers/staging/rtl8192e/rtl_core.c | 4 ++-- drivers/staging/rtl8192e/rtl_wx.c | 4 ++-- drivers/staging/rtl8192e/rtllib.h | 6 +++--- drivers/staging/rtl8192e/rtllib_module.c | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/drivers/staging/rtl8192e/rtl_core.c b/drivers/staging/rtl8192e/rtl_core.c index cb25212f8738..b7eebf42b52d 100644 --- a/drivers/staging/rtl8192e/rtl_core.c +++ b/drivers/staging/rtl8192e/rtl_core.c @@ -1071,7 +1071,7 @@ int rtl8192_sta_down(struct net_device *dev, bool shutdownrf) kfree(priv->rtllib->wpa_ie); priv->rtllib->wpa_ie = NULL; CamResetAllEntry(dev); - memset(priv->rtllib->swcamtable,0,sizeof(SW_CAM_TABLE)*32); + memset(priv->rtllib->swcamtable,0,sizeof(struct sw_cam_table)*32); rtl8192_irq_disable(dev); del_timer_sync(&priv->watch_dog_timer); @@ -1224,7 +1224,7 @@ static void rtl8192_init_priv_variable(struct net_device* dev) priv->bForcedSilentReset = 0; priv->bDisableNormalResetCheck = false; priv->force_reset = false; - memset(priv->rtllib->swcamtable,0,sizeof(SW_CAM_TABLE)*32); + memset(priv->rtllib->swcamtable,0,sizeof(struct sw_cam_table)*32); memset(&priv->InterruptLog,0,sizeof(struct log_int_8190)); priv->RxCounter = 0; diff --git a/drivers/staging/rtl8192e/rtl_wx.c b/drivers/staging/rtl8192e/rtl_wx.c index 2079ae8ec849..3a0fcfc3401e 100644 --- a/drivers/staging/rtl8192e/rtl_wx.c +++ b/drivers/staging/rtl8192e/rtl_wx.c @@ -764,7 +764,7 @@ static int r8192_wx_set_enc(struct net_device *dev, if (wrqu->encoding.flags & IW_ENCODE_DISABLED) { ieee->pairwise_key_type = ieee->group_key_type = KEY_TYPE_NA; CamResetAllEntry(dev); - memset(priv->rtllib->swcamtable,0,sizeof(SW_CAM_TABLE)*32); + memset(priv->rtllib->swcamtable,0,sizeof(struct sw_cam_table)*32); goto end_hw_sec; } if (wrqu->encoding.length!=0){ @@ -989,7 +989,7 @@ static int r8192_wx_set_enc_ext(struct net_device *dev, { ieee->pairwise_key_type = ieee->group_key_type = KEY_TYPE_NA; CamResetAllEntry(dev); - memset(priv->rtllib->swcamtable,0,sizeof(SW_CAM_TABLE)*32); + memset(priv->rtllib->swcamtable,0,sizeof(struct sw_cam_table)*32); goto end_hw_sec; } alg = (ext->alg == IW_ENCODE_ALG_CCMP)?KEY_TYPE_CCMP:ext->alg; diff --git a/drivers/staging/rtl8192e/rtllib.h b/drivers/staging/rtl8192e/rtllib.h index 6102c929a0c8..28e6e62e2b41 100644 --- a/drivers/staging/rtl8192e/rtllib.h +++ b/drivers/staging/rtl8192e/rtllib.h @@ -2006,7 +2006,7 @@ struct rt_link_detect { u32 LastNumRxUnicast; };//, *struct rt_link_detect *; -typedef struct _SW_CAM_TABLE{ +struct sw_cam_table { u8 macaddr[6]; bool bused; @@ -2015,7 +2015,7 @@ typedef struct _SW_CAM_TABLE{ u8 useDK; u8 key_index; -}SW_CAM_TABLE,*PSW_CAM_TABLE; +};//,*struct sw_cam_table *; #define TOTAL_CAM_ENTRY 32 typedef struct _rate_adaptive { @@ -2232,7 +2232,7 @@ struct rtllib_device { struct rtllib_crypt_data *crypt[WEP_KEYS]; int tx_keyidx; /* default TX key index (crypt[tx_keyidx]) */ - SW_CAM_TABLE swcamtable[TOTAL_CAM_ENTRY]; + struct sw_cam_table swcamtable[TOTAL_CAM_ENTRY]; struct timer_list crypt_deinit_timer; int crypt_quiesced; diff --git a/drivers/staging/rtl8192e/rtllib_module.c b/drivers/staging/rtl8192e/rtllib_module.c index 65034a4588d2..5daaabd33218 100644 --- a/drivers/staging/rtl8192e/rtllib_module.c +++ b/drivers/staging/rtl8192e/rtllib_module.c @@ -159,7 +159,7 @@ struct net_device *alloc_rtllib(int sizeof_priv) ieee->raw_tx = 0; ieee->hwsec_active = 0; - memset(ieee->swcamtable,0,sizeof(SW_CAM_TABLE)*32); + memset(ieee->swcamtable,0,sizeof(struct sw_cam_table)*32); rtllib_softmac_init(ieee); ieee->pHTInfo = (struct rt_hi_throughput*)kzalloc(sizeof(struct rt_hi_throughput), GFP_KERNEL); -- 2.20.1