mirrors/linux
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2026-05-05 19:24:01 -04:00
Code Issues Packages Projects Releases Wiki Activity

drivers: staging: rtl8187se: fixed broken indentation

Browse Source 
A section of code in the function rtl8180_tx was indented for no reason,
causing numerous checkpatch.pl warnings.

Signed-off-by: Axel Rasmussen <axel.rasmussen1@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Axel Rasmussen
2014-03-04 00:12:54 -07:00
committed by Greg Kroah-Hartman
parent 8d808aa660
commit d310c5a47b
1 changed files with 62 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

118
drivers/staging/rtl8187se/r8180_core.c
View File

@@ -1750,74 +1750,80 @@ short rtl8180_tx(struct net_device *dev, u8 *txbuf, int len, int priority,
break;
}
memcpy(&dest, frag_hdr->addr1, ETH_ALEN);
if (is_multicast_ether_addr(dest)) {
Duration = 0;
RtsDur = 0;
bRTSEnable = 0;
memcpy(&dest, frag_hdr->addr1, ETH_ALEN);
if (is_multicast_ether_addr(dest)) {
Duration = 0;
RtsDur = 0;
bRTSEnable = 0;
bCTSEnable = 0;
ThisFrameTime = ComputeTxTime(len + sCrcLng,
rtl8180_rate2rate(rate), 0, bUseShortPreamble);
TxDescDuration = ThisFrameTime;
} else { /* Unicast packet */
u16 AckTime;
/* YJ,add,080828,for Keep alive */
priv->NumTxUnicast++;
/* Figure out ACK rate according to BSS basic rate
* and Tx rate.
* AckCTSLng = 14 use 1M bps send
*/
AckTime = ComputeTxTime(14, 10, 0, 0);
if (((len + sCrcLng) > priv->rts) && priv->rts) { /* RTS/CTS. */
u16 RtsTime, CtsTime;
/* u16 CtsRate; */
bRTSEnable = 1;
bCTSEnable = 0;
ThisFrameTime = ComputeTxTime(len + sCrcLng, rtl8180_rate2rate(rate),
0, bUseShortPreamble);
TxDescDuration = ThisFrameTime;
} else { /* Unicast packet */
u16 AckTime;
/* Rate and time required for RTS. */
RtsTime = ComputeTxTime(sAckCtsLng / 8,
priv->ieee80211->basic_rate, 0, 0);
/* YJ,add,080828,for Keep alive */
priv->NumTxUnicast++;
/* Rate and time required for CTS.
* AckCTSLng = 14 use 1M bps send
*/
CtsTime = ComputeTxTime(14, 10, 0, 0);
/* Figure out ACK rate according to BSS basic rate
* and Tx rate. */
AckTime = ComputeTxTime(14, 10, 0, 0); /* AckCTSLng = 14 use 1M bps send */
/* Figure out time required to transmit this frame. */
ThisFrameTime = ComputeTxTime(len + sCrcLng,
rtl8180_rate2rate(rate), 0,
bUseShortPreamble);
if (((len + sCrcLng) > priv->rts) && priv->rts) { /* RTS/CTS. */
u16 RtsTime, CtsTime;
/* u16 CtsRate; */
bRTSEnable = 1;
bCTSEnable = 0;
/* RTS-CTS-ThisFrame-ACK. */
RtsDur = CtsTime + ThisFrameTime +
AckTime + 3 * aSifsTime;
/* Rate and time required for RTS. */
RtsTime = ComputeTxTime(sAckCtsLng/8, priv->ieee80211->basic_rate, 0, 0);
/* Rate and time required for CTS. */
CtsTime = ComputeTxTime(14, 10, 0, 0); /* AckCTSLng = 14 use 1M bps send */
TxDescDuration = RtsTime + RtsDur;
} else { /* Normal case. */
bCTSEnable = 0;
bRTSEnable = 0;
RtsDur = 0;
/* Figure out time required to transmit this frame. */
ThisFrameTime = ComputeTxTime(len + sCrcLng,
rtl8180_rate2rate(rate),
0,
bUseShortPreamble);
ThisFrameTime = ComputeTxTime(len + sCrcLng,
rtl8180_rate2rate(rate), 0, bUseShortPreamble);
TxDescDuration = ThisFrameTime + aSifsTime + AckTime;
}
/* RTS-CTS-ThisFrame-ACK. */
RtsDur = CtsTime + ThisFrameTime + AckTime + 3*aSifsTime;
if (!(frag_hdr->frame_control & IEEE80211_FCTL_MOREFRAGS)) {
/* ThisFrame-ACK. */
Duration = aSifsTime + AckTime;
} else { /* One or more fragments remained. */
u16 NextFragTime;
TxDescDuration = RtsTime + RtsDur;
} else { /* Normal case. */
bCTSEnable = 0;
bRTSEnable = 0;
RtsDur = 0;
/* pretend following packet length = current packet */
NextFragTime = ComputeTxTime(len + sCrcLng,
rtl8180_rate2rate(rate), 0, bUseShortPreamble);
ThisFrameTime = ComputeTxTime(len + sCrcLng, rtl8180_rate2rate(rate),
0, bUseShortPreamble);
TxDescDuration = ThisFrameTime + aSifsTime + AckTime;
}
/* ThisFrag-ACk-NextFrag-ACK. */
Duration = NextFragTime + 3 * aSifsTime + 2 * AckTime;
}
if (!(frag_hdr->frame_control & IEEE80211_FCTL_MOREFRAGS)) {
/* ThisFrame-ACK. */
Duration = aSifsTime + AckTime;
} else { /* One or more fragments remained. */
u16 NextFragTime;
NextFragTime = ComputeTxTime(len + sCrcLng, /* pretend following packet length equal current packet */
rtl8180_rate2rate(rate),
0,
bUseShortPreamble);
} /* End of Unicast packet */
/* ThisFrag-ACk-NextFrag-ACK. */
Duration = NextFragTime + 3*aSifsTime + 2*AckTime;
}
} /* End of Unicast packet */
frag_hdr->duration_id = Duration;
frag_hdr->duration_id = Duration;
buflen = priv->txbuffsize;
remain = len;