lkml.org 
[lkml]   [2012]   [Mar]   [13]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    /
    SubjectRe: [PATCH] Staging: rtl8187se: r8180_core.c: Fix coding style issue
    From
    Date
    On Tue, 2012-03-13 at 20:58 -0400, Andrew Miller wrote:
    > Fix long line coding style issue
    > Signed-off-by: Andrew Miller <amiller@amilx.com>

    Hi Andrew.

    Please strive for clarity instead of just fixing
    random 80 char warnings.

    > diff --git a/drivers/staging/rtl8187se/r8180_core.c b/drivers/staging/rtl8187se/r8180_core.c
    []
    > @@ -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);

    Likely these | uses should be ||

    > 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)) {

    This is difficult to read and could be better written
    removing unnecessary parentheses and making the egMacAddr
    clearer as a function/macro call:

    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)

    It might be better to reshuffle the test order too:
    if (IEEE80211_FTYPE_CTL != type &&
    !bHwError && bCRC && !bICV &&
    eqMacAddr(priv->ieee80211->current_network.bssid,
    fc & IEEE80211_FCTL_TODS ? hdr->addr1 :
    fc & IEEE80211_FCTL_FROMDS ? hdr->addr2 :
    hdr->addr3))

    etc...



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