Commit 1dc89bb9 authored by Larry Finger's avatar Larry Finger Committed by Kalle Valo

rtlwifi: Fix alignment errors in wifi.h

The instances where statement continuations are improperly aligned have
been fixed.

There are no changes to generated code.
Signed-off-by: default avatarLarry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: default avatarKalle Valo <kvalo@codeaurora.org>
parent d3da329c
...@@ -1466,7 +1466,7 @@ struct rtl_io { ...@@ -1466,7 +1466,7 @@ struct rtl_io {
void (*write16_async)(struct rtl_priv *rtlpriv, u32 addr, u16 val); void (*write16_async)(struct rtl_priv *rtlpriv, u32 addr, u16 val);
void (*write32_async)(struct rtl_priv *rtlpriv, u32 addr, u32 val); void (*write32_async)(struct rtl_priv *rtlpriv, u32 addr, u32 val);
void (*writen_sync)(struct rtl_priv *rtlpriv, u32 addr, void *buf, void (*writen_sync)(struct rtl_priv *rtlpriv, u32 addr, void *buf,
u16 len); u16 len);
u8 (*read8_sync)(struct rtl_priv *rtlpriv, u32 addr); u8 (*read8_sync)(struct rtl_priv *rtlpriv, u32 addr);
u16 (*read16_sync)(struct rtl_priv *rtlpriv, u32 addr); u16 (*read16_sync)(struct rtl_priv *rtlpriv, u32 addr);
...@@ -2222,7 +2222,7 @@ struct rtl_hal_ops { ...@@ -2222,7 +2222,7 @@ struct rtl_hal_ops {
void (*read_chip_version)(struct ieee80211_hw *hw); void (*read_chip_version)(struct ieee80211_hw *hw);
void (*read_eeprom_info)(struct ieee80211_hw *hw); void (*read_eeprom_info)(struct ieee80211_hw *hw);
void (*interrupt_recognized)(struct ieee80211_hw *hw, void (*interrupt_recognized)(struct ieee80211_hw *hw,
struct rtl_int *intvec); struct rtl_int *intvec);
int (*hw_init)(struct ieee80211_hw *hw); int (*hw_init)(struct ieee80211_hw *hw);
void (*hw_disable)(struct ieee80211_hw *hw); void (*hw_disable)(struct ieee80211_hw *hw);
void (*hw_suspend)(struct ieee80211_hw *hw); void (*hw_suspend)(struct ieee80211_hw *hw);
...@@ -2230,22 +2230,22 @@ struct rtl_hal_ops { ...@@ -2230,22 +2230,22 @@ struct rtl_hal_ops {
void (*enable_interrupt)(struct ieee80211_hw *hw); void (*enable_interrupt)(struct ieee80211_hw *hw);
void (*disable_interrupt)(struct ieee80211_hw *hw); void (*disable_interrupt)(struct ieee80211_hw *hw);
int (*set_network_type)(struct ieee80211_hw *hw, int (*set_network_type)(struct ieee80211_hw *hw,
enum nl80211_iftype type); enum nl80211_iftype type);
void (*set_chk_bssid)(struct ieee80211_hw *hw, void (*set_chk_bssid)(struct ieee80211_hw *hw,
bool check_bssid); bool check_bssid);
void (*set_bw_mode)(struct ieee80211_hw *hw, void (*set_bw_mode)(struct ieee80211_hw *hw,
enum nl80211_channel_type ch_type); enum nl80211_channel_type ch_type);
u8 (*switch_channel)(struct ieee80211_hw *hw); u8 (*switch_channel)(struct ieee80211_hw *hw);
void (*set_qos)(struct ieee80211_hw *hw, int aci); void (*set_qos)(struct ieee80211_hw *hw, int aci);
void (*set_bcn_reg)(struct ieee80211_hw *hw); void (*set_bcn_reg)(struct ieee80211_hw *hw);
void (*set_bcn_intv)(struct ieee80211_hw *hw); void (*set_bcn_intv)(struct ieee80211_hw *hw);
void (*update_interrupt_mask)(struct ieee80211_hw *hw, void (*update_interrupt_mask)(struct ieee80211_hw *hw,
u32 add_msr, u32 rm_msr); u32 add_msr, u32 rm_msr);
void (*get_hw_reg)(struct ieee80211_hw *hw, u8 variable, u8 *val); void (*get_hw_reg)(struct ieee80211_hw *hw, u8 variable, u8 *val);
void (*set_hw_reg)(struct ieee80211_hw *hw, u8 variable, u8 *val); void (*set_hw_reg)(struct ieee80211_hw *hw, u8 variable, u8 *val);
void (*update_rate_tbl)(struct ieee80211_hw *hw, void (*update_rate_tbl)(struct ieee80211_hw *hw,
struct ieee80211_sta *sta, u8 rssi_leve, struct ieee80211_sta *sta, u8 rssi_leve,
bool update_bw); bool update_bw);
void (*pre_fill_tx_bd_desc)(struct ieee80211_hw *hw, u8 *tx_bd_desc, void (*pre_fill_tx_bd_desc)(struct ieee80211_hw *hw, u8 *tx_bd_desc,
u8 *desc, u8 queue_index, u8 *desc, u8 queue_index,
struct sk_buff *skb, dma_addr_t addr); struct sk_buff *skb, dma_addr_t addr);
...@@ -2255,74 +2255,74 @@ struct rtl_hal_ops { ...@@ -2255,74 +2255,74 @@ struct rtl_hal_ops {
void (*rx_check_dma_ok)(struct ieee80211_hw *hw, u8 *header_desc, void (*rx_check_dma_ok)(struct ieee80211_hw *hw, u8 *header_desc,
u8 queue_index); u8 queue_index);
void (*fill_tx_desc)(struct ieee80211_hw *hw, void (*fill_tx_desc)(struct ieee80211_hw *hw,
struct ieee80211_hdr *hdr, u8 *pdesc_tx, struct ieee80211_hdr *hdr, u8 *pdesc_tx,
u8 *pbd_desc_tx, u8 *pbd_desc_tx,
struct ieee80211_tx_info *info, struct ieee80211_tx_info *info,
struct ieee80211_sta *sta, struct ieee80211_sta *sta,
struct sk_buff *skb, u8 hw_queue, struct sk_buff *skb, u8 hw_queue,
struct rtl_tcb_desc *ptcb_desc); struct rtl_tcb_desc *ptcb_desc);
void (*fill_fake_txdesc)(struct ieee80211_hw *hw, u8 *pdesc, void (*fill_fake_txdesc)(struct ieee80211_hw *hw, u8 *pdesc,
u32 buffer_len, bool bsspspoll); u32 buffer_len, bool bsspspoll);
void (*fill_tx_cmddesc)(struct ieee80211_hw *hw, u8 *pdesc, void (*fill_tx_cmddesc)(struct ieee80211_hw *hw, u8 *pdesc,
bool firstseg, bool lastseg, bool firstseg, bool lastseg,
struct sk_buff *skb); struct sk_buff *skb);
void (*fill_tx_special_desc)(struct ieee80211_hw *hw, void (*fill_tx_special_desc)(struct ieee80211_hw *hw,
u8 *pdesc, u8 *pbd_desc, u8 *pdesc, u8 *pbd_desc,
struct sk_buff *skb, u8 hw_queue); struct sk_buff *skb, u8 hw_queue);
bool (*query_rx_desc)(struct ieee80211_hw *hw, bool (*query_rx_desc)(struct ieee80211_hw *hw,
struct rtl_stats *stats, struct rtl_stats *stats,
struct ieee80211_rx_status *rx_status, struct ieee80211_rx_status *rx_status,
u8 *pdesc, struct sk_buff *skb); u8 *pdesc, struct sk_buff *skb);
void (*set_channel_access)(struct ieee80211_hw *hw); void (*set_channel_access)(struct ieee80211_hw *hw);
bool (*radio_onoff_checking)(struct ieee80211_hw *hw, u8 *valid); bool (*radio_onoff_checking)(struct ieee80211_hw *hw, u8 *valid);
void (*dm_watchdog)(struct ieee80211_hw *hw); void (*dm_watchdog)(struct ieee80211_hw *hw);
void (*scan_operation_backup)(struct ieee80211_hw *hw, u8 operation); void (*scan_operation_backup)(struct ieee80211_hw *hw, u8 operation);
bool (*set_rf_power_state)(struct ieee80211_hw *hw, bool (*set_rf_power_state)(struct ieee80211_hw *hw,
enum rf_pwrstate rfpwr_state); enum rf_pwrstate rfpwr_state);
void (*led_control)(struct ieee80211_hw *hw, void (*led_control)(struct ieee80211_hw *hw,
enum led_ctl_mode ledaction); enum led_ctl_mode ledaction);
void (*set_desc)(struct ieee80211_hw *hw, u8 *pdesc, bool istx, void (*set_desc)(struct ieee80211_hw *hw, u8 *pdesc, bool istx,
u8 desc_name, u8 *val); u8 desc_name, u8 *val);
u64 (*get_desc)(struct ieee80211_hw *hw, u8 *pdesc, bool istx, u64 (*get_desc)(struct ieee80211_hw *hw, u8 *pdesc, bool istx,
u8 desc_name); u8 desc_name);
bool (*is_tx_desc_closed)(struct ieee80211_hw *hw, bool (*is_tx_desc_closed)(struct ieee80211_hw *hw,
u8 hw_queue, u16 index); u8 hw_queue, u16 index);
void (*tx_polling)(struct ieee80211_hw *hw, u8 hw_queue); void (*tx_polling)(struct ieee80211_hw *hw, u8 hw_queue);
void (*enable_hw_sec)(struct ieee80211_hw *hw); void (*enable_hw_sec)(struct ieee80211_hw *hw);
void (*set_key)(struct ieee80211_hw *hw, u32 key_index, void (*set_key)(struct ieee80211_hw *hw, u32 key_index,
u8 *macaddr, bool is_group, u8 enc_algo, u8 *macaddr, bool is_group, u8 enc_algo,
bool is_wepkey, bool clear_all); bool is_wepkey, bool clear_all);
void (*init_sw_leds)(struct ieee80211_hw *hw); void (*init_sw_leds)(struct ieee80211_hw *hw);
void (*deinit_sw_leds)(struct ieee80211_hw *hw); void (*deinit_sw_leds)(struct ieee80211_hw *hw);
u32 (*get_bbreg)(struct ieee80211_hw *hw, u32 regaddr, u32 bitmask); u32 (*get_bbreg)(struct ieee80211_hw *hw, u32 regaddr, u32 bitmask);
void (*set_bbreg)(struct ieee80211_hw *hw, u32 regaddr, u32 bitmask, void (*set_bbreg)(struct ieee80211_hw *hw, u32 regaddr, u32 bitmask,
u32 data); u32 data);
u32 (*get_rfreg)(struct ieee80211_hw *hw, enum radio_path rfpath, u32 (*get_rfreg)(struct ieee80211_hw *hw, enum radio_path rfpath,
u32 regaddr, u32 bitmask); u32 regaddr, u32 bitmask);
void (*set_rfreg)(struct ieee80211_hw *hw, enum radio_path rfpath, void (*set_rfreg)(struct ieee80211_hw *hw, enum radio_path rfpath,
u32 regaddr, u32 bitmask, u32 data); u32 regaddr, u32 bitmask, u32 data);
void (*linked_set_reg)(struct ieee80211_hw *hw); void (*linked_set_reg)(struct ieee80211_hw *hw);
void (*chk_switch_dmdp)(struct ieee80211_hw *hw); void (*chk_switch_dmdp)(struct ieee80211_hw *hw);
void (*dualmac_easy_concurrent)(struct ieee80211_hw *hw); void (*dualmac_easy_concurrent)(struct ieee80211_hw *hw);
void (*dualmac_switch_to_dmdp)(struct ieee80211_hw *hw); void (*dualmac_switch_to_dmdp)(struct ieee80211_hw *hw);
bool (*phy_rf6052_config)(struct ieee80211_hw *hw); bool (*phy_rf6052_config)(struct ieee80211_hw *hw);
void (*phy_rf6052_set_cck_txpower)(struct ieee80211_hw *hw, void (*phy_rf6052_set_cck_txpower)(struct ieee80211_hw *hw,
u8 *powerlevel); u8 *powerlevel);
void (*phy_rf6052_set_ofdm_txpower)(struct ieee80211_hw *hw, void (*phy_rf6052_set_ofdm_txpower)(struct ieee80211_hw *hw,
u8 *ppowerlevel, u8 channel); u8 *ppowerlevel, u8 channel);
bool (*config_bb_with_headerfile)(struct ieee80211_hw *hw, bool (*config_bb_with_headerfile)(struct ieee80211_hw *hw,
u8 configtype); u8 configtype);
bool (*config_bb_with_pgheaderfile)(struct ieee80211_hw *hw, bool (*config_bb_with_pgheaderfile)(struct ieee80211_hw *hw,
u8 configtype); u8 configtype);
void (*phy_lc_calibrate)(struct ieee80211_hw *hw, bool is2t); void (*phy_lc_calibrate)(struct ieee80211_hw *hw, bool is2t);
void (*phy_set_bw_mode_callback)(struct ieee80211_hw *hw); void (*phy_set_bw_mode_callback)(struct ieee80211_hw *hw);
void (*dm_dynamic_txpower)(struct ieee80211_hw *hw); void (*dm_dynamic_txpower)(struct ieee80211_hw *hw);
void (*c2h_command_handle)(struct ieee80211_hw *hw); void (*c2h_command_handle)(struct ieee80211_hw *hw);
void (*bt_wifi_media_status_notify)(struct ieee80211_hw *hw, void (*bt_wifi_media_status_notify)(struct ieee80211_hw *hw,
bool mstate); bool mstate);
void (*bt_coex_off_before_lps)(struct ieee80211_hw *hw); void (*bt_coex_off_before_lps)(struct ieee80211_hw *hw);
void (*fill_h2c_cmd)(struct ieee80211_hw *hw, u8 element_id, void (*fill_h2c_cmd)(struct ieee80211_hw *hw, u8 element_id,
u32 cmd_len, u8 *p_cmdbuffer); u32 cmd_len, u8 *p_cmdbuffer);
void (*set_default_port_id_cmd)(struct ieee80211_hw *hw); void (*set_default_port_id_cmd)(struct ieee80211_hw *hw);
bool (*get_btc_status)(void); bool (*get_btc_status)(void);
bool (*is_fw_header)(struct rtlwifi_firmware_header *hdr); bool (*is_fw_header)(struct rtlwifi_firmware_header *hdr);
...@@ -2343,14 +2343,14 @@ struct rtl_intf_ops { ...@@ -2343,14 +2343,14 @@ struct rtl_intf_ops {
struct rtl_priv **buddy_priv); struct rtl_priv **buddy_priv);
int (*adapter_tx)(struct ieee80211_hw *hw, int (*adapter_tx)(struct ieee80211_hw *hw,
struct ieee80211_sta *sta, struct ieee80211_sta *sta,
struct sk_buff *skb, struct sk_buff *skb,
struct rtl_tcb_desc *ptcb_desc); struct rtl_tcb_desc *ptcb_desc);
void (*flush)(struct ieee80211_hw *hw, u32 queues, bool drop); void (*flush)(struct ieee80211_hw *hw, u32 queues, bool drop);
int (*reset_trx_ring)(struct ieee80211_hw *hw); int (*reset_trx_ring)(struct ieee80211_hw *hw);
bool (*waitq_insert)(struct ieee80211_hw *hw, bool (*waitq_insert)(struct ieee80211_hw *hw,
struct ieee80211_sta *sta, struct ieee80211_sta *sta,
struct sk_buff *skb); struct sk_buff *skb);
/*pci */ /*pci */
void (*disable_aspm)(struct ieee80211_hw *hw); void (*disable_aspm)(struct ieee80211_hw *hw);
...@@ -2689,11 +2689,11 @@ struct rtl_btc_ops { ...@@ -2689,11 +2689,11 @@ struct rtl_btc_ops {
u8 scantype); u8 scantype);
void (*btc_connect_notify)(struct rtl_priv *rtlpriv, u8 action); void (*btc_connect_notify)(struct rtl_priv *rtlpriv, u8 action);
void (*btc_mediastatus_notify)(struct rtl_priv *rtlpriv, void (*btc_mediastatus_notify)(struct rtl_priv *rtlpriv,
enum rt_media_status mstatus); enum rt_media_status mstatus);
void (*btc_periodical)(struct rtl_priv *rtlpriv); void (*btc_periodical)(struct rtl_priv *rtlpriv);
void (*btc_halt_notify)(struct rtl_priv *rtlpriv); void (*btc_halt_notify)(struct rtl_priv *rtlpriv);
void (*btc_btinfo_notify)(struct rtl_priv *rtlpriv, void (*btc_btinfo_notify)(struct rtl_priv *rtlpriv,
u8 *tmp_buf, u8 length); u8 *tmp_buf, u8 length);
void (*btc_btmpinfo_notify)(struct rtl_priv *rtlpriv, void (*btc_btmpinfo_notify)(struct rtl_priv *rtlpriv,
u8 *tmp_buf, u8 length); u8 *tmp_buf, u8 length);
bool (*btc_is_limited_dig)(struct rtl_priv *rtlpriv); bool (*btc_is_limited_dig)(struct rtl_priv *rtlpriv);
...@@ -3155,7 +3155,7 @@ static inline void rtl_set_bbreg(struct ieee80211_hw *hw, u32 regaddr, ...@@ -3155,7 +3155,7 @@ static inline void rtl_set_bbreg(struct ieee80211_hw *hw, u32 regaddr,
} }
static inline void rtl_set_bbreg_with_dwmask(struct ieee80211_hw *hw, static inline void rtl_set_bbreg_with_dwmask(struct ieee80211_hw *hw,
u32 regaddr, u32 data) u32 regaddr, u32 data)
{ {
rtl_set_bbreg(hw, regaddr, 0xffffffff, data); rtl_set_bbreg(hw, regaddr, 0xffffffff, data);
} }
...@@ -3226,7 +3226,7 @@ static inline struct ieee80211_sta *get_sta(struct ieee80211_hw *hw, ...@@ -3226,7 +3226,7 @@ static inline struct ieee80211_sta *get_sta(struct ieee80211_hw *hw,
} }
static inline struct ieee80211_sta *rtl_find_sta(struct ieee80211_hw *hw, static inline struct ieee80211_sta *rtl_find_sta(struct ieee80211_hw *hw,
u8 *mac_addr) u8 *mac_addr)
{ {
struct rtl_mac *mac = rtl_mac(rtl_priv(hw)); struct rtl_mac *mac = rtl_mac(rtl_priv(hw));
return ieee80211_find_sta(mac->vif, mac_addr); return ieee80211_find_sta(mac->vif, mac_addr);
......
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