diff options
-rw-r--r-- | drivers/staging/rtl8192e/rtl8192e/rtl_core.c | 4 | ||||
-rw-r--r-- | drivers/staging/rtl8192e/rtllib.h | 2 | ||||
-rw-r--r-- | drivers/staging/rtl8192e/rtllib_rx.c | 2 | ||||
-rw-r--r-- | drivers/staging/rtl8192e/rtllib_softmac.c | 6 | ||||
-rw-r--r-- | drivers/staging/rtl8192e/rtllib_softmac_wx.c | 4 |
5 files changed, 9 insertions, 9 deletions
diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_core.c b/drivers/staging/rtl8192e/rtl8192e/rtl_core.c index 605bce803b5f..de06b0248525 100644 --- a/drivers/staging/rtl8192e/rtl8192e/rtl_core.c +++ b/drivers/staging/rtl8192e/rtl8192e/rtl_core.c @@ -925,7 +925,7 @@ static void _rtl92e_update_rxcounts(struct r8192_priv *priv, u32 *TotalRxBcnNum, priv->rtllib->link_detect_info.RxBcnNum[slot_index] = priv->rtllib->link_detect_info.num_recv_bcn_in_period; priv->rtllib->link_detect_info.RxDataNum[slot_index] = - priv->rtllib->link_detect_info.NumRecvDataInPeriod; + priv->rtllib->link_detect_info.num_recv_data_in_period; for (i = 0; i < priv->rtllib->link_detect_info.slot_num; i++) { *TotalRxBcnNum += priv->rtllib->link_detect_info.RxBcnNum[i]; *TotalRxDataNum += priv->rtllib->link_detect_info.RxDataNum[i]; @@ -1045,7 +1045,7 @@ static void _rtl92e_watchdog_wq_cb(void *data) priv->check_roaming_cnt = 0; } ieee->link_detect_info.num_recv_bcn_in_period = 0; - ieee->link_detect_info.NumRecvDataInPeriod = 0; + ieee->link_detect_info.num_recv_data_in_period = 0; } spin_lock_irqsave(&priv->tx_lock, flags); diff --git a/drivers/staging/rtl8192e/rtllib.h b/drivers/staging/rtl8192e/rtllib.h index cb7d6b24117a..9150019d3cf0 100644 --- a/drivers/staging/rtl8192e/rtllib.h +++ b/drivers/staging/rtl8192e/rtllib.h @@ -1094,7 +1094,7 @@ enum scan_op_backup_opt { #define RT_MAX_LD_SLOT_NUM 10 struct rt_link_detect { u32 num_recv_bcn_in_period; - u32 NumRecvDataInPeriod; + u32 num_recv_data_in_period; u32 RxBcnNum[RT_MAX_LD_SLOT_NUM]; u32 RxDataNum[RT_MAX_LD_SLOT_NUM]; diff --git a/drivers/staging/rtl8192e/rtllib_rx.c b/drivers/staging/rtl8192e/rtllib_rx.c index 1e4956fc6754..31c96a6952eb 100644 --- a/drivers/staging/rtl8192e/rtllib_rx.c +++ b/drivers/staging/rtl8192e/rtllib_rx.c @@ -1280,7 +1280,7 @@ static int rtllib_rx_InfraAdhoc(struct rtllib_device *ieee, struct sk_buff *skb, /* Filter WAPI DATA Frame */ /* Update statstics for AP roaming */ - ieee->link_detect_info.NumRecvDataInPeriod++; + ieee->link_detect_info.num_recv_data_in_period++; ieee->link_detect_info.num_rx_ok_in_period++; /* Data frame - extract src/dst addresses */ diff --git a/drivers/staging/rtl8192e/rtllib_softmac.c b/drivers/staging/rtl8192e/rtllib_softmac.c index f12ee685e989..83f337e27209 100644 --- a/drivers/staging/rtl8192e/rtllib_softmac.c +++ b/drivers/staging/rtl8192e/rtllib_softmac.c @@ -1075,9 +1075,9 @@ static void rtllib_associate_complete_wq(void *data) ieee->current_network.beacon_interval / 500); if (ieee->link_detect_info.num_recv_bcn_in_period == 0 || - ieee->link_detect_info.NumRecvDataInPeriod == 0) { + ieee->link_detect_info.num_recv_data_in_period == 0) { ieee->link_detect_info.num_recv_bcn_in_period = 1; - ieee->link_detect_info.NumRecvDataInPeriod = 1; + ieee->link_detect_info.num_recv_data_in_period = 1; } psc->lps_idle_count = 0; ieee->link_change(ieee->dev); @@ -2071,7 +2071,7 @@ int rtllib_softmac_init(struct rtllib_device *ieee) ieee->link_detect_info.slot_index = 0; ieee->link_detect_info.slot_num = 2; ieee->link_detect_info.num_recv_bcn_in_period = 0; - ieee->link_detect_info.NumRecvDataInPeriod = 0; + ieee->link_detect_info.num_recv_data_in_period = 0; ieee->link_detect_info.num_tx_ok_in_period = 0; ieee->link_detect_info.num_rx_ok_in_period = 0; ieee->link_detect_info.num_rx_unicast_ok_in_period = 0; diff --git a/drivers/staging/rtl8192e/rtllib_softmac_wx.c b/drivers/staging/rtl8192e/rtllib_softmac_wx.c index 4102c2d4f8dd..d6bc74ba9092 100644 --- a/drivers/staging/rtl8192e/rtllib_softmac_wx.c +++ b/drivers/staging/rtl8192e/rtllib_softmac_wx.c @@ -348,9 +348,9 @@ void rtllib_wx_sync_scan_wq(void *data) rtllib_sta_ps_send_null_frame(ieee, 0); if (ieee->link_detect_info.num_recv_bcn_in_period == 0 || - ieee->link_detect_info.NumRecvDataInPeriod == 0) { + ieee->link_detect_info.num_recv_data_in_period == 0) { ieee->link_detect_info.num_recv_bcn_in_period = 1; - ieee->link_detect_info.NumRecvDataInPeriod = 1; + ieee->link_detect_info.num_recv_data_in_period = 1; } rtllib_wake_all_queues(ieee); |