Merge tag 'staging-5.5-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh...

[sfrench/cifs-2.6.git] / drivers / staging / vt6655 / rxtx.c

diff --git a/drivers/staging/vt6655/rxtx.c b/drivers/staging/vt6655/rxtx.c
index a14908895b9e17efd4c6fd066b231209908ef8e9..37fcc42ed000b9af1e3fbfb07e8bfe19fc0100ed 100644 (file)
--- a/drivers/staging/vt6655/rxtx.c
+++ b/drivers/staging/vt6655/rxtx.c
@@ -1289,7 +1289,7 @@ int vnt_generate_fifo_header(struct vnt_private *priv, u32 dma_idx,
 
        current_rate = rate->hw_value;
        if (priv->wCurrentRate != current_rate &&
-                       !(priv->hw->conf.flags & IEEE80211_CONF_OFFCHANNEL)) {
+           !(priv->hw->conf.flags & IEEE80211_CONF_OFFCHANNEL)) {
                priv->wCurrentRate = current_rate;
 
                RFbSetPower(priv, priv->wCurrentRate,
@@ -1396,7 +1396,8 @@ int vnt_generate_fifo_header(struct vnt_private *priv, u32 dma_idx,
                tx_key = info->control.hw_key;
                if (tx_key->keylen > 0)
                        vnt_fill_txkey(hdr, tx_buffer_head->tx_key,
-                               tx_key, skb, tx_body_size, td_info->mic_hdr);
+                                      tx_key, skb, tx_body_size,
+                                      td_info->mic_hdr);
        }
 
        return 0;