Commit 5ea04480 authored by Larry Finger's avatar Larry Finger

staging: rtl8192e: Convert typedef SW_CAM_TABLE to struct sw_cam_table

Remove typedef from struct.
Rename struct.
Rename uses.
Signed-off-by: default avatarLarry Finger <Larry.Finger@lwfinger.net>
parent 0e86753f
...@@ -1071,7 +1071,7 @@ int rtl8192_sta_down(struct net_device *dev, bool shutdownrf) ...@@ -1071,7 +1071,7 @@ int rtl8192_sta_down(struct net_device *dev, bool shutdownrf)
kfree(priv->rtllib->wpa_ie); kfree(priv->rtllib->wpa_ie);
priv->rtllib->wpa_ie = NULL; priv->rtllib->wpa_ie = NULL;
CamResetAllEntry(dev); 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); rtl8192_irq_disable(dev);
del_timer_sync(&priv->watch_dog_timer); del_timer_sync(&priv->watch_dog_timer);
...@@ -1224,7 +1224,7 @@ static void rtl8192_init_priv_variable(struct net_device* dev) ...@@ -1224,7 +1224,7 @@ static void rtl8192_init_priv_variable(struct net_device* dev)
priv->bForcedSilentReset = 0; priv->bForcedSilentReset = 0;
priv->bDisableNormalResetCheck = false; priv->bDisableNormalResetCheck = false;
priv->force_reset = 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)); memset(&priv->InterruptLog,0,sizeof(struct log_int_8190));
priv->RxCounter = 0; priv->RxCounter = 0;
......
...@@ -764,7 +764,7 @@ static int r8192_wx_set_enc(struct net_device *dev, ...@@ -764,7 +764,7 @@ static int r8192_wx_set_enc(struct net_device *dev,
if (wrqu->encoding.flags & IW_ENCODE_DISABLED) { if (wrqu->encoding.flags & IW_ENCODE_DISABLED) {
ieee->pairwise_key_type = ieee->group_key_type = KEY_TYPE_NA; ieee->pairwise_key_type = ieee->group_key_type = KEY_TYPE_NA;
CamResetAllEntry(dev); 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; goto end_hw_sec;
} }
if (wrqu->encoding.length!=0){ if (wrqu->encoding.length!=0){
...@@ -989,7 +989,7 @@ static int r8192_wx_set_enc_ext(struct net_device *dev, ...@@ -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; ieee->pairwise_key_type = ieee->group_key_type = KEY_TYPE_NA;
CamResetAllEntry(dev); 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; goto end_hw_sec;
} }
alg = (ext->alg == IW_ENCODE_ALG_CCMP)?KEY_TYPE_CCMP:ext->alg; alg = (ext->alg == IW_ENCODE_ALG_CCMP)?KEY_TYPE_CCMP:ext->alg;
......
...@@ -2006,7 +2006,7 @@ struct rt_link_detect { ...@@ -2006,7 +2006,7 @@ struct rt_link_detect {
u32 LastNumRxUnicast; u32 LastNumRxUnicast;
};//, *struct rt_link_detect *; };//, *struct rt_link_detect *;
typedef struct _SW_CAM_TABLE{ struct sw_cam_table {
u8 macaddr[6]; u8 macaddr[6];
bool bused; bool bused;
...@@ -2015,7 +2015,7 @@ typedef struct _SW_CAM_TABLE{ ...@@ -2015,7 +2015,7 @@ typedef struct _SW_CAM_TABLE{
u8 useDK; u8 useDK;
u8 key_index; u8 key_index;
}SW_CAM_TABLE,*PSW_CAM_TABLE; };//,*struct sw_cam_table *;
#define TOTAL_CAM_ENTRY 32 #define TOTAL_CAM_ENTRY 32
typedef struct _rate_adaptive typedef struct _rate_adaptive
{ {
...@@ -2232,7 +2232,7 @@ struct rtllib_device { ...@@ -2232,7 +2232,7 @@ struct rtllib_device {
struct rtllib_crypt_data *crypt[WEP_KEYS]; struct rtllib_crypt_data *crypt[WEP_KEYS];
int tx_keyidx; /* default TX key index (crypt[tx_keyidx]) */ 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; struct timer_list crypt_deinit_timer;
int crypt_quiesced; int crypt_quiesced;
......
...@@ -159,7 +159,7 @@ struct net_device *alloc_rtllib(int sizeof_priv) ...@@ -159,7 +159,7 @@ struct net_device *alloc_rtllib(int sizeof_priv)
ieee->raw_tx = 0; ieee->raw_tx = 0;
ieee->hwsec_active = 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); rtllib_softmac_init(ieee);
ieee->pHTInfo = (struct rt_hi_throughput*)kzalloc(sizeof(struct rt_hi_throughput), GFP_KERNEL); ieee->pHTInfo = (struct rt_hi_throughput*)kzalloc(sizeof(struct rt_hi_throughput), GFP_KERNEL);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment