Commit b16abaaf authored by Larry Finger's avatar Larry Finger Committed by Kalle Valo

rtlwifi: Fix all blank line irregularities in main code files

The types of problems fixed are as follows:

WARNING: Missing a blank line after declarations
CHECK: Please use a blank line after function/struct/union/enum declarations
CHECK: Please don't use multiple blank lines

There are no code changes.
Signed-off-by: default avatarLarry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: default avatarKalle Valo <kvalo@codeaurora.org>
parent 93665097
...@@ -430,6 +430,7 @@ static void _rtl_init_mac80211(struct ieee80211_hw *hw) ...@@ -430,6 +430,7 @@ static void _rtl_init_mac80211(struct ieee80211_hw *hw)
SET_IEEE80211_PERM_ADDR(hw, rtlefuse->dev_addr); SET_IEEE80211_PERM_ADDR(hw, rtlefuse->dev_addr);
} else { } else {
u8 rtlmac1[] = { 0x00, 0xe0, 0x4c, 0x81, 0x92, 0x00 }; u8 rtlmac1[] = { 0x00, 0xe0, 0x4c, 0x81, 0x92, 0x00 };
get_random_bytes((rtlmac1 + (ETH_ALEN - 1)), 1); get_random_bytes((rtlmac1 + (ETH_ALEN - 1)), 1);
SET_IEEE80211_PERM_ADDR(hw, rtlmac1); SET_IEEE80211_PERM_ADDR(hw, rtlmac1);
} }
...@@ -459,7 +460,6 @@ static void _rtl_init_deferred_work(struct ieee80211_hw *hw) ...@@ -459,7 +460,6 @@ static void _rtl_init_deferred_work(struct ieee80211_hw *hw)
(void *)rtl_fwevt_wq_callback); (void *)rtl_fwevt_wq_callback);
INIT_DELAYED_WORK(&rtlpriv->works.c2hcmd_wq, INIT_DELAYED_WORK(&rtlpriv->works.c2hcmd_wq,
(void *)rtl_c2hcmd_wq_callback); (void *)rtl_c2hcmd_wq_callback);
} }
void rtl_deinit_deferred_work(struct ieee80211_hw *hw, bool ips_wq) void rtl_deinit_deferred_work(struct ieee80211_hw *hw, bool ips_wq)
...@@ -618,6 +618,7 @@ static void _rtl_query_shortgi(struct ieee80211_hw *hw, ...@@ -618,6 +618,7 @@ static void _rtl_query_shortgi(struct ieee80211_hw *hw,
u8 rate_flag = info->control.rates[0].flags; u8 rate_flag = info->control.rates[0].flags;
u8 sgi_40 = 0, sgi_20 = 0, bw_40 = 0; u8 sgi_40 = 0, sgi_20 = 0, bw_40 = 0;
u8 sgi_80 = 0, bw_80 = 0; u8 sgi_80 = 0, bw_80 = 0;
tcb_desc->use_shortgi = false; tcb_desc->use_shortgi = false;
if (sta == NULL) if (sta == NULL)
...@@ -1850,6 +1851,7 @@ int rtl_rx_agg_stop(struct ieee80211_hw *hw, ...@@ -1850,6 +1851,7 @@ int rtl_rx_agg_stop(struct ieee80211_hw *hw,
return 0; return 0;
} }
int rtl_tx_agg_oper(struct ieee80211_hw *hw, int rtl_tx_agg_oper(struct ieee80211_hw *hw,
struct ieee80211_sta *sta, u16 tid) struct ieee80211_sta *sta, u16 tid)
{ {
...@@ -2073,7 +2075,6 @@ void rtl_watchdog_wq_callback(void *data) ...@@ -2073,7 +2075,6 @@ void rtl_watchdog_wq_callback(void *data)
* busytraffic we don't change channel * busytraffic we don't change channel
*/ */
if (mac->link_state >= MAC80211_LINKED) { if (mac->link_state >= MAC80211_LINKED) {
/* (1) get aver_rx_cnt_inperiod & aver_tx_cnt_inperiod */ /* (1) get aver_rx_cnt_inperiod & aver_tx_cnt_inperiod */
for (idx = 0; idx <= 2; idx++) { for (idx = 0; idx <= 2; idx++) {
rtlpriv->link_info.num_rx_in4period[idx] = rtlpriv->link_info.num_rx_in4period[idx] =
...@@ -2233,6 +2234,7 @@ void rtl_watch_dog_timer_callback(struct timer_list *t) ...@@ -2233,6 +2234,7 @@ void rtl_watch_dog_timer_callback(struct timer_list *t)
mod_timer(&rtlpriv->works.watchdog_timer, mod_timer(&rtlpriv->works.watchdog_timer,
jiffies + MSECS(RTL_WATCH_DOG_TIME)); jiffies + MSECS(RTL_WATCH_DOG_TIME));
} }
void rtl_fwevt_wq_callback(void *data) void rtl_fwevt_wq_callback(void *data)
{ {
struct rtl_works *rtlworks = struct rtl_works *rtlworks =
...@@ -2384,6 +2386,7 @@ void rtl_easy_concurrent_retrytimer_callback(struct timer_list *t) ...@@ -2384,6 +2386,7 @@ void rtl_easy_concurrent_retrytimer_callback(struct timer_list *t)
rtlpriv->cfg->ops->dualmac_easy_concurrent(hw); rtlpriv->cfg->ops->dualmac_easy_concurrent(hw);
} }
/********************************************************* /*********************************************************
* *
* frame process functions * frame process functions
......
...@@ -188,6 +188,7 @@ static void rtl_op_tx(struct ieee80211_hw *hw, ...@@ -188,6 +188,7 @@ static void rtl_op_tx(struct ieee80211_hw *hw,
struct rtl_hal *rtlhal = rtl_hal(rtl_priv(hw)); struct rtl_hal *rtlhal = rtl_hal(rtl_priv(hw));
struct rtl_ps_ctl *ppsc = rtl_psc(rtl_priv(hw)); struct rtl_ps_ctl *ppsc = rtl_psc(rtl_priv(hw));
struct rtl_tcb_desc tcb_desc; struct rtl_tcb_desc tcb_desc;
memset(&tcb_desc, 0, sizeof(struct rtl_tcb_desc)); memset(&tcb_desc, 0, sizeof(struct rtl_tcb_desc));
if (unlikely(is_hal_stop(rtlhal) || ppsc->rfpwr_state != ERFON)) if (unlikely(is_hal_stop(rtlhal) || ppsc->rfpwr_state != ERFON))
...@@ -346,12 +347,14 @@ static void rtl_op_remove_interface(struct ieee80211_hw *hw, ...@@ -346,12 +347,14 @@ static void rtl_op_remove_interface(struct ieee80211_hw *hw,
mutex_unlock(&rtlpriv->locks.conf_mutex); mutex_unlock(&rtlpriv->locks.conf_mutex);
} }
static int rtl_op_change_interface(struct ieee80211_hw *hw, static int rtl_op_change_interface(struct ieee80211_hw *hw,
struct ieee80211_vif *vif, struct ieee80211_vif *vif,
enum nl80211_iftype new_type, bool p2p) enum nl80211_iftype new_type, bool p2p)
{ {
struct rtl_priv *rtlpriv = rtl_priv(hw); struct rtl_priv *rtlpriv = rtl_priv(hw);
int ret; int ret;
rtl_op_remove_interface(hw, vif); rtl_op_remove_interface(hw, vif);
vif->type = new_type; vif->type = new_type;
...@@ -881,6 +884,7 @@ static void rtl_op_configure_filter(struct ieee80211_hw *hw, ...@@ -881,6 +884,7 @@ static void rtl_op_configure_filter(struct ieee80211_hw *hw,
rtlpriv->cfg->ops->set_hw_reg(hw, HW_VAR_RCR, rtlpriv->cfg->ops->set_hw_reg(hw, HW_VAR_RCR,
(u8 *)(&mac->rx_conf)); (u8 *)(&mac->rx_conf));
} }
static int rtl_op_sta_add(struct ieee80211_hw *hw, static int rtl_op_sta_add(struct ieee80211_hw *hw,
struct ieee80211_vif *vif, struct ieee80211_vif *vif,
struct ieee80211_sta *sta) struct ieee80211_sta *sta)
...@@ -933,6 +937,7 @@ static int rtl_op_sta_remove(struct ieee80211_hw *hw, ...@@ -933,6 +937,7 @@ static int rtl_op_sta_remove(struct ieee80211_hw *hw,
{ {
struct rtl_priv *rtlpriv = rtl_priv(hw); struct rtl_priv *rtlpriv = rtl_priv(hw);
struct rtl_sta_info *sta_entry; struct rtl_sta_info *sta_entry;
if (sta) { if (sta) {
RT_TRACE(rtlpriv, COMP_MAC80211, DBG_DMESG, RT_TRACE(rtlpriv, COMP_MAC80211, DBG_DMESG,
"Remove sta addr is %pM\n", sta->addr); "Remove sta addr is %pM\n", sta->addr);
...@@ -945,6 +950,7 @@ static int rtl_op_sta_remove(struct ieee80211_hw *hw, ...@@ -945,6 +950,7 @@ static int rtl_op_sta_remove(struct ieee80211_hw *hw,
} }
return 0; return 0;
} }
static int _rtl_get_hal_qnum(u16 queue) static int _rtl_get_hal_qnum(u16 queue)
{ {
int qnum; int qnum;
...@@ -1066,6 +1072,7 @@ static void rtl_op_bss_info_changed(struct ieee80211_hw *hw, ...@@ -1066,6 +1072,7 @@ static void rtl_op_bss_info_changed(struct ieee80211_hw *hw,
/*TODO: reference to enum ieee80211_bss_change */ /*TODO: reference to enum ieee80211_bss_change */
if (changed & BSS_CHANGED_ASSOC) { if (changed & BSS_CHANGED_ASSOC) {
u8 mstatus; u8 mstatus;
if (bss_conf->assoc) { if (bss_conf->assoc) {
struct ieee80211_sta *sta = NULL; struct ieee80211_sta *sta = NULL;
u8 keep_alive = 10; u8 keep_alive = 10;
...@@ -1294,6 +1301,7 @@ static void rtl_op_bss_info_changed(struct ieee80211_hw *hw, ...@@ -1294,6 +1301,7 @@ static void rtl_op_bss_info_changed(struct ieee80211_hw *hw,
* set in sta_add, and will be NULL here */ * set in sta_add, and will be NULL here */
if (vif->type == NL80211_IFTYPE_STATION) { if (vif->type == NL80211_IFTYPE_STATION) {
struct rtl_sta_info *sta_entry; struct rtl_sta_info *sta_entry;
sta_entry = (struct rtl_sta_info *)sta->drv_priv; sta_entry = (struct rtl_sta_info *)sta->drv_priv;
sta_entry->wireless_mode = mac->mode; sta_entry->wireless_mode = mac->mode;
} }
......
...@@ -474,6 +474,7 @@ bool efuse_shadow_update(struct ieee80211_hw *hw) ...@@ -474,6 +474,7 @@ bool efuse_shadow_update(struct ieee80211_hw *hw)
if (word_en != 0x0F) { if (word_en != 0x0F) {
u8 tmpdata[8]; u8 tmpdata[8];
memcpy(tmpdata, memcpy(tmpdata,
&rtlefuse->efuse_map[EFUSE_MODIFY_MAP][base], &rtlefuse->efuse_map[EFUSE_MODIFY_MAP][base],
8); 8);
...@@ -487,7 +488,6 @@ bool efuse_shadow_update(struct ieee80211_hw *hw) ...@@ -487,7 +488,6 @@ bool efuse_shadow_update(struct ieee80211_hw *hw)
break; break;
} }
} }
} }
efuse_power_switch(hw, true, false); efuse_power_switch(hw, true, false);
...@@ -662,6 +662,7 @@ static int efuse_one_byte_write(struct ieee80211_hw *hw, u16 addr, u8 data) ...@@ -662,6 +662,7 @@ static int efuse_one_byte_write(struct ieee80211_hw *hw, u16 addr, u8 data)
static void efuse_read_all_map(struct ieee80211_hw *hw, u8 *efuse) static void efuse_read_all_map(struct ieee80211_hw *hw, u8 *efuse)
{ {
struct rtl_priv *rtlpriv = rtl_priv(hw); struct rtl_priv *rtlpriv = rtl_priv(hw);
efuse_power_switch(hw, false, true); efuse_power_switch(hw, false, true);
read_efuse(hw, 0, rtlpriv->cfg->maps[EFUSE_HWSET_MAX_SIZE], efuse); read_efuse(hw, 0, rtlpriv->cfg->maps[EFUSE_HWSET_MAX_SIZE], efuse);
efuse_power_switch(hw, false, false); efuse_power_switch(hw, false, false);
...@@ -812,6 +813,7 @@ static void efuse_write_data_case1(struct ieee80211_hw *hw, u16 *efuse_addr, ...@@ -812,6 +813,7 @@ static void efuse_write_data_case1(struct ieee80211_hw *hw, u16 *efuse_addr,
if (0x0F != (badworden & 0x0F)) { if (0x0F != (badworden & 0x0F)) {
u8 reorg_offset = offset; u8 reorg_offset = offset;
u8 reorg_worden = badworden; u8 reorg_worden = badworden;
efuse_pg_packet_write(hw, reorg_offset, efuse_pg_packet_write(hw, reorg_offset,
reorg_worden, reorg_worden,
originaldata); originaldata);
...@@ -901,6 +903,7 @@ static void efuse_write_data_case2(struct ieee80211_hw *hw, u16 *efuse_addr, ...@@ -901,6 +903,7 @@ static void efuse_write_data_case2(struct ieee80211_hw *hw, u16 *efuse_addr,
if (0x0F != (badworden & 0x0F)) { if (0x0F != (badworden & 0x0F)) {
u8 reorg_offset = tmp_pkt.offset; u8 reorg_offset = tmp_pkt.offset;
u8 reorg_worden = badworden; u8 reorg_worden = badworden;
efuse_pg_packet_write(hw, reorg_offset, efuse_pg_packet_write(hw, reorg_offset,
reorg_worden, reorg_worden,
originaldata); originaldata);
...@@ -957,7 +960,6 @@ static int efuse_pg_packet_write(struct ieee80211_hw *hw, ...@@ -957,7 +960,6 @@ static int efuse_pg_packet_write(struct ieee80211_hw *hw,
while (continual && (efuse_addr < (EFUSE_MAX_SIZE - while (continual && (efuse_addr < (EFUSE_MAX_SIZE -
rtlpriv->cfg->maps[EFUSE_OOB_PROTECT_BYTES_LEN]))) { rtlpriv->cfg->maps[EFUSE_OOB_PROTECT_BYTES_LEN]))) {
if (write_state == PG_STATE_HEADER) { if (write_state == PG_STATE_HEADER) {
dataempty = true; dataempty = true;
badworden = 0x0F; badworden = 0x0F;
...@@ -1114,7 +1116,6 @@ void efuse_power_switch(struct ieee80211_hw *hw, u8 write, u8 pwrstate) ...@@ -1114,7 +1116,6 @@ void efuse_power_switch(struct ieee80211_hw *hw, u8 write, u8 pwrstate)
u16 tmpv16; u16 tmpv16;
if (pwrstate && (rtlhal->hw_type != HARDWARE_TYPE_RTL8192SE)) { if (pwrstate && (rtlhal->hw_type != HARDWARE_TYPE_RTL8192SE)) {
if (rtlhal->hw_type != HARDWARE_TYPE_RTL8192CE && if (rtlhal->hw_type != HARDWARE_TYPE_RTL8192CE &&
rtlhal->hw_type != HARDWARE_TYPE_RTL8192DE) { rtlhal->hw_type != HARDWARE_TYPE_RTL8192DE) {
rtl_write_byte(rtlpriv, rtl_write_byte(rtlpriv,
...@@ -1219,6 +1220,7 @@ static u16 efuse_get_current_size(struct ieee80211_hw *hw) ...@@ -1219,6 +1220,7 @@ static u16 efuse_get_current_size(struct ieee80211_hw *hw)
static u8 efuse_calculate_word_cnts(u8 word_en) static u8 efuse_calculate_word_cnts(u8 word_en)
{ {
u8 word_cnts = 0; u8 word_cnts = 0;
if (!(word_en & BIT(0))) if (!(word_en & BIT(0)))
word_cnts++; word_cnts++;
if (!(word_en & BIT(1))) if (!(word_en & BIT(1)))
......
...@@ -718,6 +718,7 @@ static void rtl_p2p_noa_ie(struct ieee80211_hw *hw, void *data, ...@@ -718,6 +718,7 @@ static void rtl_p2p_noa_ie(struct ieee80211_hw *hw, void *data,
static u8 p2p_oui_ie_type[4] = {0x50, 0x6f, 0x9a, 0x09}; static u8 p2p_oui_ie_type[4] = {0x50, 0x6f, 0x9a, 0x09};
u8 noa_num, index , i, noa_index = 0; u8 noa_num, index , i, noa_index = 0;
bool find_p2p_ie = false , find_p2p_ps_ie = false; bool find_p2p_ie = false , find_p2p_ps_ie = false;
pos = (u8 *)mgmt->u.beacon.variable; pos = (u8 *)mgmt->u.beacon.variable;
end = data + len; end = data + len;
ie = NULL; ie = NULL;
......
...@@ -236,6 +236,7 @@ static void rtl_tx_status(void *ppriv, ...@@ -236,6 +236,7 @@ static void rtl_tx_status(void *ppriv,
!(skb->protocol == cpu_to_be16(ETH_P_PAE))) { !(skb->protocol == cpu_to_be16(ETH_P_PAE))) {
if (ieee80211_is_data_qos(fc)) { if (ieee80211_is_data_qos(fc)) {
u8 tid = rtl_get_tid(skb); u8 tid = rtl_get_tid(skb);
if (_rtl_tx_aggr_check(rtlpriv, sta_entry, if (_rtl_tx_aggr_check(rtlpriv, sta_entry,
tid)) { tid)) {
sta_entry->tids[tid].agg.agg_state = sta_entry->tids[tid].agg.agg_state =
...@@ -293,6 +294,7 @@ static void rtl_rate_free_sta(void *rtlpriv, ...@@ -293,6 +294,7 @@ static void rtl_rate_free_sta(void *rtlpriv,
struct ieee80211_sta *sta, void *priv_sta) struct ieee80211_sta *sta, void *priv_sta)
{ {
struct rtl_rate_priv *rate_priv = priv_sta; struct rtl_rate_priv *rate_priv = priv_sta;
kfree(rate_priv); kfree(rate_priv);
} }
......
...@@ -41,7 +41,6 @@ static struct country_code_to_enum_rd all_countries[] = { ...@@ -41,7 +41,6 @@ static struct country_code_to_enum_rd all_countries[] = {
NL80211_RRF_PASSIVE_SCAN | \ NL80211_RRF_PASSIVE_SCAN | \
NL80211_RRF_NO_OFDM) NL80211_RRF_NO_OFDM)
/* 5G chan 36 - chan 64*/ /* 5G chan 36 - chan 64*/
#define RTL819x_5GHZ_5150_5350 \ #define RTL819x_5GHZ_5150_5350 \
REG_RULE(5150-10, 5350+10, 80, 0, 30, 0) REG_RULE(5150-10, 5350+10, 80, 0, 30, 0)
......
...@@ -267,6 +267,7 @@ static int _rtl_usb_init_tx(struct ieee80211_hw *hw) ...@@ -267,6 +267,7 @@ static int _rtl_usb_init_tx(struct ieee80211_hw *hw)
for (i = 0; i < __RTL_TXQ_NUM; i++) { for (i = 0; i < __RTL_TXQ_NUM; i++) {
u32 ep_num = rtlusb->ep_map.ep_mapping[i]; u32 ep_num = rtlusb->ep_map.ep_mapping[i];
if (!ep_num) { if (!ep_num) {
RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG, RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG,
"Invalid endpoint map setting!\n"); "Invalid endpoint map setting!\n");
...@@ -331,6 +332,7 @@ static int _rtl_usb_init(struct ieee80211_hw *hw) ...@@ -331,6 +332,7 @@ static int _rtl_usb_init(struct ieee80211_hw *hw)
rtlusb->out_ep_nums = rtlusb->in_ep_nums = 0; rtlusb->out_ep_nums = rtlusb->in_ep_nums = 0;
for (epidx = 0; epidx < epnums; epidx++) { for (epidx = 0; epidx < epnums; epidx++) {
struct usb_endpoint_descriptor *pep_desc; struct usb_endpoint_descriptor *pep_desc;
pep_desc = &usb_intf->cur_altsetting->endpoint[epidx].desc; pep_desc = &usb_intf->cur_altsetting->endpoint[epidx].desc;
if (usb_endpoint_dir_in(pep_desc)) if (usb_endpoint_dir_in(pep_desc))
...@@ -753,6 +755,7 @@ static int rtl_usb_start(struct ieee80211_hw *hw) ...@@ -753,6 +755,7 @@ static int rtl_usb_start(struct ieee80211_hw *hw)
return err; return err;
} }
/** /**
* *
* *
......
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