Commit d310c5a4 authored by Axel Rasmussen's avatar Axel Rasmussen Committed by Greg Kroah-Hartman

drivers: staging: rtl8187se: fixed broken indentation

A section of code in the function rtl8180_tx was indented for no reason,
causing numerous checkpatch.pl warnings.
Signed-off-by: default avatarAxel Rasmussen <axel.rasmussen1@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 8d808aa6
...@@ -1757,8 +1757,8 @@ short rtl8180_tx(struct net_device *dev, u8 *txbuf, int len, int priority, ...@@ -1757,8 +1757,8 @@ short rtl8180_tx(struct net_device *dev, u8 *txbuf, int len, int priority,
bRTSEnable = 0; bRTSEnable = 0;
bCTSEnable = 0; bCTSEnable = 0;
ThisFrameTime = ComputeTxTime(len + sCrcLng, rtl8180_rate2rate(rate), ThisFrameTime = ComputeTxTime(len + sCrcLng,
0, bUseShortPreamble); rtl8180_rate2rate(rate), 0, bUseShortPreamble);
TxDescDuration = ThisFrameTime; TxDescDuration = ThisFrameTime;
} else { /* Unicast packet */ } else { /* Unicast packet */
u16 AckTime; u16 AckTime;
...@@ -1767,8 +1767,10 @@ short rtl8180_tx(struct net_device *dev, u8 *txbuf, int len, int priority, ...@@ -1767,8 +1767,10 @@ short rtl8180_tx(struct net_device *dev, u8 *txbuf, int len, int priority,
priv->NumTxUnicast++; priv->NumTxUnicast++;
/* Figure out ACK rate according to BSS basic rate /* Figure out ACK rate according to BSS basic rate
* and Tx rate. */ * and Tx rate.
AckTime = ComputeTxTime(14, 10, 0, 0); /* AckCTSLng = 14 use 1M bps send */ * AckCTSLng = 14 use 1M bps send
*/
AckTime = ComputeTxTime(14, 10, 0, 0);
if (((len + sCrcLng) > priv->rts) && priv->rts) { /* RTS/CTS. */ if (((len + sCrcLng) > priv->rts) && priv->rts) { /* RTS/CTS. */
u16 RtsTime, CtsTime; u16 RtsTime, CtsTime;
...@@ -1777,18 +1779,22 @@ short rtl8180_tx(struct net_device *dev, u8 *txbuf, int len, int priority, ...@@ -1777,18 +1779,22 @@ short rtl8180_tx(struct net_device *dev, u8 *txbuf, int len, int priority,
bCTSEnable = 0; bCTSEnable = 0;
/* Rate and time required for RTS. */ /* Rate and time required for RTS. */
RtsTime = ComputeTxTime(sAckCtsLng/8, priv->ieee80211->basic_rate, 0, 0); RtsTime = ComputeTxTime(sAckCtsLng / 8,
/* Rate and time required for CTS. */ priv->ieee80211->basic_rate, 0, 0);
CtsTime = ComputeTxTime(14, 10, 0, 0); /* AckCTSLng = 14 use 1M bps send */
/* Rate and time required for CTS.
* AckCTSLng = 14 use 1M bps send
*/
CtsTime = ComputeTxTime(14, 10, 0, 0);
/* Figure out time required to transmit this frame. */ /* Figure out time required to transmit this frame. */
ThisFrameTime = ComputeTxTime(len + sCrcLng, ThisFrameTime = ComputeTxTime(len + sCrcLng,
rtl8180_rate2rate(rate), rtl8180_rate2rate(rate), 0,
0,
bUseShortPreamble); bUseShortPreamble);
/* RTS-CTS-ThisFrame-ACK. */ /* RTS-CTS-ThisFrame-ACK. */
RtsDur = CtsTime + ThisFrameTime + AckTime + 3*aSifsTime; RtsDur = CtsTime + ThisFrameTime +
AckTime + 3 * aSifsTime;
TxDescDuration = RtsTime + RtsDur; TxDescDuration = RtsTime + RtsDur;
} else { /* Normal case. */ } else { /* Normal case. */
...@@ -1796,8 +1802,8 @@ short rtl8180_tx(struct net_device *dev, u8 *txbuf, int len, int priority, ...@@ -1796,8 +1802,8 @@ short rtl8180_tx(struct net_device *dev, u8 *txbuf, int len, int priority,
bRTSEnable = 0; bRTSEnable = 0;
RtsDur = 0; RtsDur = 0;
ThisFrameTime = ComputeTxTime(len + sCrcLng, rtl8180_rate2rate(rate), ThisFrameTime = ComputeTxTime(len + sCrcLng,
0, bUseShortPreamble); rtl8180_rate2rate(rate), 0, bUseShortPreamble);
TxDescDuration = ThisFrameTime + aSifsTime + AckTime; TxDescDuration = ThisFrameTime + aSifsTime + AckTime;
} }
...@@ -1806,13 +1812,13 @@ short rtl8180_tx(struct net_device *dev, u8 *txbuf, int len, int priority, ...@@ -1806,13 +1812,13 @@ short rtl8180_tx(struct net_device *dev, u8 *txbuf, int len, int priority,
Duration = aSifsTime + AckTime; Duration = aSifsTime + AckTime;
} else { /* One or more fragments remained. */ } else { /* One or more fragments remained. */
u16 NextFragTime; u16 NextFragTime;
NextFragTime = ComputeTxTime(len + sCrcLng, /* pretend following packet length equal current packet */
rtl8180_rate2rate(rate), /* pretend following packet length = current packet */
0, NextFragTime = ComputeTxTime(len + sCrcLng,
bUseShortPreamble); rtl8180_rate2rate(rate), 0, bUseShortPreamble);
/* ThisFrag-ACk-NextFrag-ACK. */ /* ThisFrag-ACk-NextFrag-ACK. */
Duration = NextFragTime + 3*aSifsTime + 2*AckTime; Duration = NextFragTime + 3 * aSifsTime + 2 * AckTime;
} }
} /* End of Unicast packet */ } /* End of Unicast packet */
......
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