lkml.org 
[lkml]   [2012]   [Mar]   [13]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH] Staging: rtl8187se: r8180_core.c: Fix coding style issue
    Date
    Fix long line coding style issue

    Signed-off-by: Andrew Miller <amiller@amilx.com>
    ---
    drivers/staging/rtl8187se/r8180_core.c | 32 ++++++++++++++++++++------------
    1 files changed, 20 insertions(+), 12 deletions(-)

    diff --git a/drivers/staging/rtl8187se/r8180_core.c b/drivers/staging/rtl8187se/r8180_core.c
    index 04c2391..9ef78f0 100644
    --- a/drivers/staging/rtl8187se/r8180_core.c
    +++ b/drivers/staging/rtl8187se/r8180_core.c
    @@ -1392,11 +1392,13 @@ void PerformUndecoratedSignalSmoothing8185(struct r8180_priv *priv,
    priv->bCurCCKPkt = bCckRate;

    if (priv->UndecoratedSmoothedSS >= 0)
    - priv->UndecoratedSmoothedSS = ((priv->UndecoratedSmoothedSS * 5) + (priv->SignalStrength * 10)) / 6;
    + priv->UndecoratedSmoothedSS = ((priv->UndecoratedSmoothedSS * 5) +
    + (priv->SignalStrength * 10)) / 6;
    else
    priv->UndecoratedSmoothedSS = priv->SignalStrength * 10;

    - priv->UndercorateSmoothedRxPower = ((priv->UndercorateSmoothedRxPower * 50) + (priv->RxPower * 11)) / 60;
    + priv->UndercorateSmoothedRxPower = ((priv->UndercorateSmoothedRxPower * 50) +
    + (priv->RxPower * 11)) / 60;

    if (bCckRate)
    priv->CurCCKRSSI = priv->RSSI;
    @@ -1607,17 +1609,20 @@ void rtl8180_rx(struct net_device *dev)
    /* printk("==========================>rx : RXAGC is %d,signalstrength is %d\n",RXAGC,stats.signalstrength); */
    stats.rssi = priv->wstats.qual.qual = priv->SignalQuality;
    stats.noise = priv->wstats.qual.noise = 100 - priv->wstats.qual.qual;
    - bHwError = (((*(priv->rxringtail)) & (0x00000fff)) == 4080) | (((*(priv->rxringtail)) & (0x04000000)) != 0)
    - | (((*(priv->rxringtail)) & (0x08000000)) != 0) | (((~(*(priv->rxringtail))) & (0x10000000)) != 0) | (((~(*(priv->rxringtail))) & (0x20000000)) != 0);
    + bHwError = (((*(priv->rxringtail)) & (0x00000fff)) == 4080) |
    + (((*(priv->rxringtail)) & (0x04000000)) != 0) |
    + (((*(priv->rxringtail)) & (0x08000000)) != 0) |
    + (((~(*(priv->rxringtail))) & (0x10000000)) != 0) |
    + (((~(*(priv->rxringtail))) & (0x20000000)) != 0);
    bCRC = ((*(priv->rxringtail)) & (0x00002000)) >> 13;
    bICV = ((*(priv->rxringtail)) & (0x00001000)) >> 12;
    hdr = (struct ieee80211_hdr_4addr *)priv->rxbuffer->buf;
    fc = le16_to_cpu(hdr->frame_ctl);
    type = WLAN_FC_GET_TYPE(fc);

    - if ((IEEE80211_FTYPE_CTL != type) &&
    - (eqMacAddr(priv->ieee80211->current_network.bssid, (fc & IEEE80211_FCTL_TODS) ? hdr->addr1 : (fc & IEEE80211_FCTL_FROMDS) ? hdr->addr2 : hdr->addr3))
    - && (!bHwError) && (!bCRC) && (!bICV)) {
    + if ((IEEE80211_FTYPE_CTL != type) && (eqMacAddr(priv->ieee80211->current_network.bssid,
    + (fc & IEEE80211_FCTL_TODS) ? hdr->addr1 : (fc & IEEE80211_FCTL_FROMDS) ? hdr->addr2 : hdr->addr3))
    + && (!bHwError) && (!bCRC) && (!bICV)) {
    /* Perform signal smoothing for dynamic
    * mechanism on demand. This is different
    * with PerformSignalSmoothing8185 in smoothing
    @@ -2112,7 +2117,7 @@ short rtl8180_tx(struct net_device *dev, u8* txbuf, int len, int priority,
    /* Use short preamble or not */
    if (priv->ieee80211->current_network.capability&WLAN_CAPABILITY_SHORT_PREAMBLE)
    if (priv->plcp_preamble_mode == 1 && rate != 0) /* short mode now, not long! */
    - ; /* *tail |= (1<<16); */ /* enable short preamble mode. */
    + ; /* *tail |= (1<<16); */ /* enable short preamble mode. */

    if (bCTSEnable)
    *tail |= (1<<18);
    @@ -2325,8 +2330,9 @@ void rtl8180_hw_sleep(struct net_device *dev, u32 th, u32 tl)
    u32 tmp = (tl > rb) ? (tl-rb) : (rb-tl);

    priv->DozePeriodInPast2Sec += jiffies_to_msecs(tmp);
    -
    - queue_delayed_work(priv->ieee80211->wq, &priv->ieee80211->hw_wakeup_wq, tmp); /* as tl may be less than rb */
    +
    + /* as tl may be less than rb */
    + queue_delayed_work(priv->ieee80211->wq, &priv->ieee80211->hw_wakeup_wq, tmp);
    }
    /*
    * If we suspect the TimerInt is gone beyond tl
    @@ -3227,7 +3233,8 @@ void LeisurePSEnter(struct r8180_priv *priv)
    {
    if (priv->bLeisurePs) {
    if (priv->ieee80211->ps == IEEE80211_PS_DISABLED)
    - MgntActSet_802_11_PowerSaveMode(priv, IEEE80211_PS_MBCAST|IEEE80211_PS_UNICAST); /* IEEE80211_PS_ENABLE */
    + /* IEEE80211_PS_ENABLE */
    + MgntActSet_802_11_PowerSaveMode(priv, IEEE80211_PS_MBCAST|IEEE80211_PS_UNICAST);
    }
    }

    @@ -3299,7 +3306,8 @@ void rtl8180_watch_dog(struct net_device *dev)
    u16 SlotIndex = 0;
    u16 i = 0;
    if (priv->ieee80211->actscanning == false) {
    - if ((priv->ieee80211->iw_mode != IW_MODE_ADHOC) && (priv->ieee80211->state == IEEE80211_NOLINK) && (priv->ieee80211->beinretry == false) && (priv->eRFPowerState == eRfOn))
    + if ((priv->ieee80211->iw_mode != IW_MODE_ADHOC) && (priv->ieee80211->state ==
    + IEEE80211_NOLINK) && (priv->ieee80211->beinretry == false) && (priv->eRFPowerState == eRfOn))
    IPSEnter(dev);
    }
    /* YJ,add,080828,for link state check */
    --
    1.7.7.6


    \
     
     \ /
      Last update: 2012-03-14 02:03    [W:0.045 / U:147.272 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site