staging: align to fix warnings of line over 80 characters
PATCH 1/1 staging: align to fix warnings of line over 80 characters
Align to fix multiple warnings of line over 80 characters. Issue detected by checkpatch tool.
Signed-off-by Jules Irenge <[email protected]>
--- drivers/staging/wfx/bus_sdio.c | 4 +- drivers/staging/wfx/data_rx.h | 3 +- drivers/staging/wfx/debug.c | 15 ++-- drivers/staging/wfx/fwio.c | 65 ++++++++++----- drivers/staging/wfx/hif_rx.c | 78 ++++++++++++------ drivers/staging/wfx/hif_tx.c | 66 ++++++++++----- drivers/staging/wfx/hif_tx_mib.h | 11 ++- drivers/staging/wfx/hwio.c | 42 ++++++---- drivers/staging/wfx/hwio.h | 9 ++- drivers/staging/wfx/key.c | 24 ++++-- drivers/staging/wfx/main.c | 61 +++++++++----- drivers/staging/wfx/queue.c | 31 ++++--- drivers/staging/wfx/queue.h | 6 +- drivers/staging/wfx/scan.c | 15 ++-- drivers/staging/wfx/sta.c | 133 +++++++++++++++++++++---------- drivers/staging/wfx/sta.h | 6 +- drivers/staging/wfx/traces.h | 27 ++++--- drivers/staging/wfx/wfx.h | 6 +- 18 files changed, 407 insertions(+), 195 deletions(-)
drivers/staging/wfx/bus_sdio.c +3 -1
@@ -188,7 +188,9 @@ static int wfx_sdio_probe(struct sdio_func *func, bus->func = func;sdio_set_drvdata (func, bus); - func->card->quirks |=MMC_QUIRK_LENIENT_FN0 |MMC_QUIRK_BLKSZ_FOR_BYTE_MODE |MMC_QUIRK_BROKEN_BYTE_MODE_512 ; + func->card->quirks |=MMC_QUIRK_LENIENT_FN0 | +MMC_QUIRK_BLKSZ_FOR_BYTE_MODE | +MMC_QUIRK_BROKEN_BYTE_MODE_512 ;sdio_claim_host (func); ret =sdio_enable_func (func);
drivers/staging/wfx/data_rx.h +2 -1
@@ -13,6 +13,7 @@struct wfx_vif ;struct sk_buff ; -void wfx_rx_cb (struct wfx_vif *wvif,struct hif_ind_rx *arg,struct sk_buff *skb); +void wfx_rx_cb (struct wfx_vif *wvif,struct hif_ind_rx *arg, +struct sk_buff *skb);#endif /* WFX_DATA_RX_H */
drivers/staging/wfx/debug.c +10 -5
@@ -72,7 +72,8 @@ static int wfx_counters_show(struct seq_file *seq, void *v)return -EIO ;#define PUT_COUNTER (name) \ - seq_printf(seq, "%24s %d\n", #name ":", le32_to_cpu(counters.count_##name)) + seq_printf(seq, "%24s %d\n", #name ":",\ + le32_to_cpu(counters.count_##name))PUT_COUNTER (tx_packets);PUT_COUNTER (tx_multicast_frames);
@@ -211,7 +212,8 @@ struct dbgfs_hif_msg {int ret; }; -static ssize_t wfx_send_hif_msg_write (struct file *file,const char __user *user_buf, +static ssize_t wfx_send_hif_msg_write (struct file *file, +const char __user *user_buf,size_t count,loff_t *ppos) {struct dbgfs_hif_msg *context = file->private_data;
@@ -236,7 +238,8 @@ static ssize_t wfx_send_hif_msg_write(struct file *file, const char __user *userkfree (request);return -EINVAL ; } - context->ret =wfx_cmd_send (wdev, request, context->reply,sizeof (context->reply), false); + context->ret =wfx_cmd_send (wdev, request, context->reply, +sizeof (context->reply), false);kfree (request);complete (&context->complete);
@@ -299,8 +302,10 @@ int wfx_debug_init(struct wfx_dev *wdev)debugfs_create_file ("counters" ,0444 , d, wdev, &wfx_counters_fops);debugfs_create_file ("rx_stats" ,0444 , d, wdev, &wfx_rx_stats_fops);debugfs_create_file ("send_pds" ,0200 , d, wdev, &wfx_send_pds_fops); -debugfs_create_file ("burn_slk_key" ,0200 , d, wdev, &wfx_burn_slk_key_fops); -debugfs_create_file ("send_hif_msg" ,0600 , d, wdev, &wfx_send_hif_msg_fops); +debugfs_create_file ("burn_slk_key" ,0200 , d, wdev, + &wfx_burn_slk_key_fops); +debugfs_create_file ("send_hif_msg" ,0600 , d, wdev, + &wfx_send_hif_msg_fops);return 0 ; }
drivers/staging/wfx/fwio.c +45 -20
137 lines not on this page · raw message
drivers/staging/wfx/hif_rx.c +53 -25
204 lines not on this page · raw message
drivers/staging/wfx/hif_tx.c +44 -22
171 lines not on this page · raw message
drivers/staging/wfx/hif_tx_mib.h +7 -4
@@ -57,8 +57,9 @@ static inline int hif_get_counters_table(struct wfx_dev *wdev,return hif_read_mib (wdev,0 ,HIF_MIB_ID_COUNTERS_TABLE , arg,sizeof (struct hif_mib_count_table )); }else { -return hif_read_mib (wdev,0 ,HIF_MIB_ID_EXTENDED_COUNTERS_TABLE , - arg,sizeof (struct hif_mib_extended_count_table )); +return hif_read_mib (wdev,0 , +HIF_MIB_ID_EXTENDED_COUNTERS_TABLE , arg, +sizeof (struct hif_mib_extended_count_table )); } }
@@ -112,7 +113,8 @@ static inline int hif_beacon_filter_control(struct wfx_vif *wvif, .bcn_count = cpu_to_le32(beacon_count), };return hif_write_mib (wvif->wdev, wvif->id, -HIF_MIB_ID_BEACON_FILTER_ENABLE , &arg,sizeof (arg)); +HIF_MIB_ID_BEACON_FILTER_ENABLE , + &arg,sizeof (arg)); } static inline int hif_set_operational_mode(struct wfx_dev *wdev,
@@ -173,7 +175,8 @@ static inline int hif_set_association_mode(struct wfx_vif *wvif,static inline int hif_set_tx_rate_retry_policy (struct wfx_vif *wvif,struct hif_mib_set_tx_rate_retry_policy *arg) { -size_t size =struct_size (arg, tx_rate_retry_policy, arg->num_tx_rate_policies); +size_t size =struct_size (arg, tx_rate_retry_policy, + arg->num_tx_rate_policies);return hif_write_mib (wvif->wdev, wvif->id,HIF_MIB_ID_SET_TX_RATE_RETRY_POLICY , arg, size);
drivers/staging/wfx/hwio.c +28 -14
114 lines not on this page · raw message
drivers/staging/wfx/hwio.h +7 -2
@@ -37,8 +37,13 @@ int ahb_reg_write(struct wfx_dev *wdev, u32 addr, u32 val);#define CFG_ERR_HOST_NO_IN_QUEUE 0x00000040#define CFG_ERR_HOST_CRC_MISS 0x00000080 // only with SDIO#define CFG_SPI_IGNORE_CS 0x00000080 // only with SPI -#define CFG_WORD_MODE_MASK 0x00000300 // Bytes ordering (only writable in SPI): -#define CFG_WORD_MODE0 0x00000000 // B1,B0,B3,B2 (In SPI, register address and CONFIG data always use this mode) +/* Bytes ordering (only writable in SPI): */ +#define CFG_WORD_MODE_MASK 0x00000300 +/* +* B1,B0,B3,B2 (In SPI, register address and +* CONFIG data always use this mode) +*/ +#define CFG_WORD_MODE0 0x00000000#define CFG_WORD_MODE1 0x00000100 // B3,B2,B1,B0#define CFG_WORD_MODE2 0x00000200 // B0,B1,B2,B3 (SDIO)#define CFG_DIRECT_ACCESS_MODE 0x00000400 // Direct or queue access mode
drivers/staging/wfx/key.c +16 -8
@@ -171,28 +171,36 @@ static int wfx_add_key(struct wfx_vif *wvif, struct ieee80211_sta *sta,return -EINVAL ; k = &wdev->keys[idx]; k->int_id = wvif->id; -if (key->cipher ==WLAN_CIPHER_SUITE_WEP40 || key->cipher ==WLAN_CIPHER_SUITE_WEP104 ) { +if (key->cipher ==WLAN_CIPHER_SUITE_WEP40 || + key->cipher ==WLAN_CIPHER_SUITE_WEP104 ) {if (pairwise) - k->type =fill_wep_pair (&k->key.wep_pairwise_key, key, sta->addr); + k->type =fill_wep_pair (&k->key.wep_pairwise_key, key, + sta->addr);else k->type =fill_wep_group (&k->key.wep_group_key, key); }else if (key->cipher ==WLAN_CIPHER_SUITE_TKIP ) {if (pairwise) - k->type =fill_tkip_pair (&k->key.tkip_pairwise_key, key, sta->addr); + k->type =fill_tkip_pair (&k->key.tkip_pairwise_key, key, + sta->addr);else - k->type =fill_tkip_group (&k->key.tkip_group_key, key, &seq, wvif->vif->type); + k->type =fill_tkip_group (&k->key.tkip_group_key, key, + &seq, wvif->vif->type); }else if (key->cipher ==WLAN_CIPHER_SUITE_CCMP ) {if (pairwise) - k->type =fill_ccmp_pair (&k->key.aes_pairwise_key, key, sta->addr); + k->type =fill_ccmp_pair (&k->key.aes_pairwise_key, key, + sta->addr);else - k->type =fill_ccmp_group (&k->key.aes_group_key, key, &seq); + k->type =fill_ccmp_group (&k->key.aes_group_key, key, + &seq); }else if (key->cipher ==WLAN_CIPHER_SUITE_SMS4 ) {if (pairwise) - k->type =fill_sms4_pair (&k->key.wapi_pairwise_key, key, sta->addr); + k->type =fill_sms4_pair (&k->key.wapi_pairwise_key, key, + sta->addr);else k->type =fill_sms4_group (&k->key.wapi_group_key, key); }else if (key->cipher ==WLAN_CIPHER_SUITE_AES_CMAC ) { - k->type =fill_aes_cmac_group (&k->key.igtk_group_key, key, &seq); + k->type =fill_aes_cmac_group (&k->key.igtk_group_key, key, + &seq); }else {dev_warn (wdev->dev,"unsupported key type %d\n" , key->cipher);wfx_free_key (wdev, idx);
drivers/staging/wfx/main.c +41 -20
165 lines not on this page · raw message
drivers/staging/wfx/queue.c +21 -10
@@ -42,7 +42,8 @@ void wfx_tx_flush(struct wfx_dev *wdev) !wdev->hif.tx_buffers_used, msecs_to_jiffies(3000));if (!ret) { -dev_warn (wdev->dev,"cannot flush tx buffers (%d still busy)\n" , wdev->hif.tx_buffers_used); +dev_warn (wdev->dev,"cannot flush tx buffers (%d still busy)\n" , + wdev->hif.tx_buffers_used);wfx_pending_dump_old_frames (wdev,3000 );// FIXME: drop pending frames here wdev->chip_frozen =1 ;
@@ -121,7 +122,8 @@ void wfx_tx_queues_wait_empty_vif(struct wfx_vif *wvif) }while (!done); } -static void wfx_tx_queue_clear (struct wfx_dev *wdev,struct wfx_queue *queue,struct sk_buff_head *gc_list) +static void wfx_tx_queue_clear (struct wfx_dev *wdev,struct wfx_queue *queue, +struct sk_buff_head *gc_list) {int i;struct sk_buff *item;
@@ -189,7 +191,8 @@ size_t wfx_tx_queue_get_num_queued(struct wfx_queue *queue, ret =skb_queue_len (&queue->queue); }else { ret =0 ; -for (i =0 , bit =1 ; i <ARRAY_SIZE (queue->link_map_cache); ++i, bit <<=1 ) { +for (i =0 , bit =1 ; i <ARRAY_SIZE (queue->link_map_cache); + ++i, bit <<=1 ) {if (link_id_map & bit) ret += queue->link_map_cache[i]; }
@@ -198,7 +201,8 @@ size_t wfx_tx_queue_get_num_queued(struct wfx_queue *queue,return ret; } -void wfx_tx_queue_put (struct wfx_dev *wdev,struct wfx_queue *queue,struct sk_buff *skb) +void wfx_tx_queue_put (struct wfx_dev *wdev,struct wfx_queue *queue, +struct sk_buff *skb) {struct wfx_queue_stats *stats = &wdev->tx_queue_stats;struct wfx_tx_priv *tx_priv =wfx_skb_tx_priv (skb);
@@ -315,7 +319,8 @@ void wfx_pending_dump_old_frames(struct wfx_dev *wdev, unsigned int limit_ms) skb_queue_walk(&stats->pending, skb) { tx_priv =wfx_skb_tx_priv (skb); req =wfx_skb_txreq (skb); -if (ktime_after (now,ktime_add_ms (tx_priv->xmit_timestamp, limit_ms))) { +if (ktime_after (now,ktime_add_ms (tx_priv->xmit_timestamp, + limit_ms))) {if (first) {dev_info (wdev->dev,"frames stuck in firmware since %dms or more:\n" , limit_ms);
@@ -329,7 +334,8 @@ void wfx_pending_dump_old_frames(struct wfx_dev *wdev, unsigned int limit_ms)spin_unlock_bh (&stats->pending.lock); } -unsigned int wfx_pending_get_pkt_us_delay (struct wfx_dev *wdev,struct sk_buff *skb) +unsigned int wfx_pending_get_pkt_us_delay (struct wfx_dev *wdev, +struct sk_buff *skb) {ktime_t now =ktime_get ();struct wfx_tx_priv *tx_priv =wfx_skb_tx_priv (skb);
@@ -376,7 +382,8 @@ static bool hif_handle_tx_data(struct wfx_vif *wvif, struct sk_buff *skb,case NL80211_IFTYPE_AP :if (!wvif->state) { action = do_drop; - }else if (!(BIT (tx_priv->raw_link_id) & (BIT (0 ) | wvif->link_id_map))) { + }else if (!(BIT (tx_priv->raw_link_id) & + (BIT (0 ) | wvif->link_id_map))) {dev_warn (wvif->wdev->dev,"a frame with expired link-id is dropped\n" ); action = do_drop; }
@@ -462,7 +469,8 @@ static int wfx_get_prio_queue(struct wfx_vif *wvif,/* override winner if bursting */ if (winner >=0 && wvif->wdev->tx_burst_idx >=0 && winner != wvif->wdev->tx_burst_idx && - !wfx_tx_queue_get_num_queued (&wvif->wdev->tx_queue[winner], tx_allowed_mask & urgent) && + !wfx_tx_queue_get_num_queued (&wvif->wdev->tx_queue[winner], + tx_allowed_mask & urgent) &&wfx_tx_queue_get_num_queued (&wvif->wdev->tx_queue[wvif->wdev->tx_burst_idx], tx_allowed_mask)) winner = wvif->wdev->tx_burst_idx;
@@ -536,10 +544,13 @@ struct hif_msg *wfx_tx_queues_get(struct wfx_dev *wdev)while ((wvif =wvif_iterate (wdev, wvif)) !=NULL ) {spin_lock_bh (&wvif->ps_state_lock); - not_found =wfx_tx_queue_mask_get (wvif, &vif_queue, &vif_tx_allowed_mask, &vif_more); + not_found =wfx_tx_queue_mask_get (wvif, &vif_queue, + &vif_tx_allowed_mask, + &vif_more);if (wvif->mcast_buffered && (not_found || !vif_more) && - (wvif->mcast_tx || !wvif->sta_asleep_mask)) { + (wvif->mcast_tx || + !wvif->sta_asleep_mask)) { wvif->mcast_buffered = false;if (wvif->mcast_tx) { wvif->mcast_tx = false;
drivers/staging/wfx/queue.h +4 -2
@@ -47,13 +47,15 @@ bool wfx_tx_queues_is_empty(struct wfx_dev *wdev);void wfx_tx_queues_wait_empty_vif (struct wfx_vif *wvif);struct hif_msg *wfx_tx_queues_get (struct wfx_dev *wdev); -void wfx_tx_queue_put (struct wfx_dev *wdev,struct wfx_queue *queue,struct sk_buff *skb); +void wfx_tx_queue_put (struct wfx_dev *wdev,struct wfx_queue *queue, +struct sk_buff *skb);size_t wfx_tx_queue_get_num_queued (struct wfx_queue *queue,u32 link_id_map);struct sk_buff *wfx_pending_get (struct wfx_dev *wdev,u32 packet_id);int wfx_pending_remove (struct wfx_dev *wdev,struct sk_buff *skb);int wfx_pending_requeue (struct wfx_dev *wdev,struct sk_buff *skb); -unsigned int wfx_pending_get_pkt_us_delay (struct wfx_dev *wdev,struct sk_buff *skb); +unsigned int wfx_pending_get_pkt_us_delay (struct wfx_dev *wdev, +struct sk_buff *skb);void wfx_pending_dump_old_frames (struct wfx_dev *wdev,unsigned int limit_ms);#endif /* WFX_QUEUE_H */
drivers/staging/wfx/scan.c +10 -5
@@ -12,7 +12,8 @@#include "sta.h" #include "hif_tx_mib.h" -static void __ieee80211_scan_completed_compat (struct ieee80211_hw *hw,bool aborted) +static void __ieee80211_scan_completed_compat (struct ieee80211_hw *hw, +bool aborted) {struct cfg80211_scan_info info = { .aborted = aborted ?1 :0 ,
@@ -159,7 +160,8 @@ void wfx_scan_work(struct work_struct *work)if (!wvif->scan.req || wvif->scan.curr == wvif->scan.end) {if (wvif->scan.output_power != wvif->wdev->output_power) -hif_set_output_power (wvif, wvif->wdev->output_power *10 ); +hif_set_output_power (wvif, + wvif->wdev->output_power *10 );if (wvif->scan.status <0 )dev_warn (wvif->wdev->dev,"scan failed\n" );
@@ -172,7 +174,8 @@ void wfx_scan_work(struct work_struct *work)wfx_scan_restart_delayed (wvif);wfx_tx_unlock (wvif->wdev);mutex_unlock (&wvif->wdev->conf_mutex); -__ieee80211_scan_completed_compat (wvif->wdev->hw, wvif->scan.status ?1 :0 ); +__ieee80211_scan_completed_compat (wvif->wdev->hw, + wvif->scan.status ?1 :0 );up (&wvif->scan.lock);if (wvif->state ==WFX_STATE_STA && !(wvif->powersave_mode.pm_mode.enter_psm))
@@ -211,7 +214,8 @@ void wfx_scan_work(struct work_struct *work) scan.scan_req.scan_flags.fbg =1 ; } - scan.ch =kcalloc (scan.scan_req.num_of_channels,sizeof (u8),GFP_KERNEL ); + scan.ch =kcalloc (scan.scan_req.num_of_channels, +sizeof (u8),GFP_KERNEL );if (!scan.ch) { wvif->scan.status = -ENOMEM ;
@@ -273,7 +277,8 @@ void wfx_scan_complete_cb(struct wfx_vif *wvif, struct hif_ind_scan_cmpl *arg)void wfx_scan_timeout (struct work_struct *work) { - struct wfx_vif *wvif = container_of(work, struct wfx_vif, scan.timeout.work); + struct wfx_vif *wvif = container_of(work, struct wfx_vif, + scan.timeout.work);if (atomic_xchg (&wvif->scan.in_progress,0 )) {if (wvif->scan.status >0 ) {
drivers/staging/wfx/sta.c +90 -43
350 lines not on this page · raw message
drivers/staging/wfx/sta.h +4 -2
@@ -86,11 +86,13 @@ void wfx_change_chanctx(struct ieee80211_hw *hw, struct ieee80211_chanctx_conf *conf, u32 changed);int wfx_assign_vif_chanctx (struct ieee80211_hw *hw,struct ieee80211_vif *vif,struct ieee80211_chanctx_conf *conf); -void wfx_unassign_vif_chanctx (struct ieee80211_hw *hw,struct ieee80211_vif *vif, +void wfx_unassign_vif_chanctx (struct ieee80211_hw *hw, +struct ieee80211_vif *vif,struct ieee80211_chanctx_conf *conf);// WSM Callbacks -void wfx_suspend_resume (struct wfx_vif *wvif,struct hif_ind_suspend_resume_tx *arg); +void wfx_suspend_resume (struct wfx_vif *wvif, +struct hif_ind_suspend_resume_tx *arg);// Other Helpers void wfx_cqm_bssloss_sm (struct wfx_vif *wvif,int init,int good,int bad);
drivers/staging/wfx/traces.h +18 -9
@@ -177,14 +177,16 @@ DECLARE_EVENT_CLASS(hif_data,else __entry->msg_type ="REQ" ;if (!is_recv && - (__entry->msg_id ==HIF_REQ_ID_READ_MIB || __entry->msg_id ==HIF_REQ_ID_WRITE_MIB )) { + (__entry->msg_id ==HIF_REQ_ID_READ_MIB || + __entry->msg_id ==HIF_REQ_ID_WRITE_MIB )) { __entry->mib =le16_to_cpup ((u16 *) hif->body); header_len =4 ; }else { __entry->mib =-1 ; header_len =0 ; } - __entry->buf_len =min_t (int, __entry->msg_len,sizeof (__entry->buf)) + __entry->buf_len =min_t (int, __entry->msg_len, +sizeof (__entry->buf)) -sizeof (struct hif_msg ) - header_len;memcpy (__entry->buf, hif->body + header_len, __entry->buf_len); ),
@@ -203,11 +205,13 @@ DECLARE_EVENT_CLASS(hif_data,DEFINE_EVENT (hif_data, hif_send, TP_PROTO(struct hif_msg *hif, int tx_fill_level, bool is_recv),TP_ARGS (hif, tx_fill_level, is_recv)); -#define _trace_hif_send (hif, tx_fill_level) trace_hif_send(hif, tx_fill_level, false) +#define _trace_hif_send (hif, tx_fill_level)\ + trace_hif_send(hif, tx_fill_level, false)DEFINE_EVENT (hif_data, hif_recv, TP_PROTO(struct hif_msg *hif, int tx_fill_level, bool is_recv),TP_ARGS (hif, tx_fill_level, is_recv)); -#define _trace_hif_recv (hif, tx_fill_level) trace_hif_recv(hif, tx_fill_level, true) +#define _trace_hif_recv (hif, tx_fill_level)\ + trace_hif_recv(hif, tx_fill_level, true)#define wfx_reg_list_enum \ wfx_reg_name(WFX_REG_CONFIG, "CONFIG") \
@@ -241,7 +245,8 @@ DECLARE_EVENT_CLASS(io_data, __entry->reg = reg; __entry->addr = addr; __entry->msg_len = len; - __entry->buf_len =min_t (int,sizeof (__entry->buf), __entry->msg_len); + __entry->buf_len =min_t (int,sizeof (__entry->buf), + __entry->msg_len);memcpy (__entry->buf, io_buf, __entry->buf_len);if (addr >=0 )snprintf (__entry->addr_str,10 ,"/%08x" , addr);
@@ -259,12 +264,14 @@ DECLARE_EVENT_CLASS(io_data,DEFINE_EVENT (io_data, io_write, TP_PROTO(int reg, int addr, const void *io_buf, size_t len),TP_ARGS (reg, addr, io_buf, len)); -#define _trace_io_ind_write (reg, addr, io_buf, len) trace_io_write(reg, addr, io_buf, len) +#define _trace_io_ind_write (reg, addr, io_buf, len)\ + trace_io_write(reg, addr, io_buf, len)#define _trace_io_write (reg, io_buf, len) trace_io_write(reg, -1, io_buf, len)DEFINE_EVENT (io_data, io_read, TP_PROTO(int reg, int addr, const void *io_buf, size_t len),TP_ARGS (reg, addr, io_buf, len)); -#define _trace_io_ind_read (reg, addr, io_buf, len) trace_io_read(reg, addr, io_buf, len) +#define _trace_io_ind_read (reg, addr, io_buf, len)\ + trace_io_read(reg, addr, io_buf, len)#define _trace_io_read (reg, io_buf, len) trace_io_read(reg, -1, io_buf, len) DECLARE_EVENT_CLASS(io_data32,
@@ -348,7 +355,8 @@ TRACE_EVENT(bh_stats, __entry->release ?"release" :"keep" ) ); -#define _trace_bh_stats (ind, req, cnf, busy, release) trace_bh_stats(ind, req, cnf, busy, release) +#define _trace_bh_stats (ind, req, cnf, busy, release)\ + trace_bh_stats(ind, req, cnf, busy, release) TRACE_EVENT(tx_stats, TP_PROTO(struct hif_cnf_tx *tx_cnf, struct sk_buff *skb, int delay),
@@ -365,7 +373,8 @@ TRACE_EVENT(tx_stats, ), TP_fast_assign( // Keep sync with wfx_rates definition in main.c - static const int hw_rate[] = { 0, 1, 2, 3, 6, 7, 8, 9, 10, 11, 12, 13 }; + static const int hw_rate[] = { 0, 1, 2, 3, 6, 7, 8, 9, + 10, 11, 12, 13 };struct ieee80211_tx_info *tx_info =IEEE80211_SKB_CB (skb);struct ieee80211_tx_rate *rates = tx_info->driver_rates;int i;
drivers/staging/wfx/wfx.h +4 -2
@@ -141,13 +141,15 @@ static inline struct wfx_vif *wdev_to_wvif(struct wfx_dev *wdev, int vif_id) } vif_id =array_index_nospec (vif_id,ARRAY_SIZE (wdev->vif));if (!wdev->vif[vif_id]) { -dev_dbg (wdev->dev,"requesting non-allocated vif: %d\n" , vif_id); +dev_dbg (wdev->dev,"requesting non-allocated vif: %d\n" , + vif_id);return NULL ; }return (struct wfx_vif *) wdev->vif[vif_id]->drv_priv; } -static inline struct wfx_vif *wvif_iterate (struct wfx_dev *wdev,struct wfx_vif *cur) +static inline struct wfx_vif *wvif_iterate (struct wfx_dev *wdev, +struct wfx_vif *cur) {int i;int mark =0 ;
Signature · 1 line
2.23.0