This patch fixes the following checkpatch.pl issues in wl_netdev.c: WARNING: suspect code indent for conditional statements
Signed-off-by: Jelena Bjelja <[email protected]> --- drivers/staging/wlags49_h2/wl_netdev.c | 56 ++++++++++++++++---------------- 1 file changed, 28 insertions(+), 28 deletions(-) diff --git a/drivers/staging/wlags49_h2/wl_netdev.c b/drivers/staging/wlags49_h2/wl_netdev.c index a1cabd2..9fb12f3 100644 --- a/drivers/staging/wlags49_h2/wl_netdev.c +++ b/drivers/staging/wlags49_h2/wl_netdev.c @@ -330,8 +330,8 @@ int wl_open(struct net_device *dev) wl_lock(lp, &flags); if (status != HCF_SUCCESS) { - /* Unsuccessful, try reset of the card to recover */ - status = wl_reset(dev); + /* Unsuccessful, try reset of the card to recover */ + status = wl_reset(dev); } /* Holding the lock too long, make a gap to allow other processes */ @@ -479,7 +479,7 @@ int wl_ioctl(struct net_device *dev, struct ifreq *rq, int cmd) #ifdef USE_RTS if (lp->useRTS == 1) { - /* Handle any RTS IOCTL here */ + /* Handle any RTS IOCTL here */ if (cmd == WL_IOCTL_RTS) { DBG_TRACE(DbgInfo, "IOCTL: WL_IOCTL_RTS\n"); ret = wvlan_rts((struct rtsreq *)rq, dev->base_addr); @@ -869,7 +869,7 @@ int wl_rx(struct net_device *dev) if (pktlen != 0) { skb = ALLOC_SKB(pktlen); if (skb != NULL) { - /* Set the netdev based on the port */ + /* Set the netdev based on the port */ switch (port) { #ifdef USE_WDS case 1: @@ -1016,7 +1016,7 @@ void wl_multicast(struct net_device *dev) if (CNV_INT_TO_LITTLE(lp->hcfCtx.IFB_FWIdentity.comp_id) == COMP_ID_FW_STA) { if (dev->flags & IFF_PROMISC) { - /* Enable promiscuous mode */ + /* Enable promiscuous mode */ lp->ltvRecord.len = 2; lp->ltvRecord.typ = CFG_PROMISCUOUS_MODE; lp->ltvRecord.u.u16[0] = CNV_INT_TO_LITTLE(1); @@ -1024,9 +1024,9 @@ void wl_multicast(struct net_device *dev) hcf_put_info(&(lp->hcfCtx), (LTVP)&(lp->ltvRecord)); } else if ((netdev_mc_count(dev) > HCF_MAX_MULTICAST) || (dev->flags & IFF_ALLMULTI)) { - /* Shutting off this filter will enable all multicast frames to - be sent up from the device; however, this is a static RID, so - a call to wl_apply() is needed */ + /* Shutting off this filter will enable all multicast frames to + be sent up from the device; however, this is a static RID, so + a call to wl_apply() is needed */ lp->ltvRecord.len = 2; lp->ltvRecord.typ = CFG_CNF_RX_ALL_GROUP_ADDR; lp->ltvRecord.u.u16[0] = CNV_INT_TO_LITTLE(0); @@ -1034,7 +1034,7 @@ void wl_multicast(struct net_device *dev) hcf_put_info(&(lp->hcfCtx), (LTVP)&(lp->ltvRecord)); wl_apply(lp); } else if (!netdev_mc_empty(dev)) { - /* Set the multicast addresses */ + /* Set the multicast addresses */ lp->ltvRecord.len = (netdev_mc_count(dev) * 3) + 1; lp->ltvRecord.typ = CFG_GROUP_ADDR; @@ -1791,25 +1791,25 @@ int wl_rx_dma(struct net_device *dev) desc = hcf_dma_rx_get(&(lp->hcfCtx)); if (desc != NULL) { -/* Check and see if we rcvd. a WMP frame */ -/* - if (((*(hcf_8 *)&desc->buf_addr[HFS_STAT]) & - (HFS_STAT_MSG_TYPE | HFS_STAT_ERR)) == HFS_STAT_WMP_MSG) - { - DBG_TRACE(DbgInfo, "Got a WMP frame\n"); - - x.len = sizeof(CFG_MB_INFO_RANGE2_STRCT) / sizeof(hcf_16); - x.typ = CFG_MB_INFO; - x.base_typ = CFG_WMP; - x.frag_cnt = 2; - x.frag_buf[0].frag_len = GET_BUF_CNT(descp) / sizeof(hcf_16); - x.frag_buf[0].frag_addr = (hcf_8 *) descp->buf_addr ; - x.frag_buf[1].frag_len = (GET_BUF_CNT(descp->next_desc_addr) + 1) / sizeof(hcf_16); - x.frag_buf[1].frag_addr = (hcf_8 *) descp->next_desc_addr->buf_addr ; - - hcf_put_info(&(lp->hcfCtx), (LTVP)&x); - } -*/ + /* Check and see if we rcvd. a WMP frame */ + /* + if (((*(hcf_8 *)&desc->buf_addr[HFS_STAT]) & + (HFS_STAT_MSG_TYPE | HFS_STAT_ERR)) == HFS_STAT_WMP_MSG) + { + DBG_TRACE(DbgInfo, "Got a WMP frame\n"); + + x.len = sizeof(CFG_MB_INFO_RANGE2_STRCT) / sizeof(hcf_16); + x.typ = CFG_MB_INFO; + x.base_typ = CFG_WMP; + x.frag_cnt = 2; + x.frag_buf[0].frag_len = GET_BUF_CNT(descp) / sizeof(hcf_16); + x.frag_buf[0].frag_addr = (hcf_8 *) descp->buf_addr ; + x.frag_buf[1].frag_len = (GET_BUF_CNT(descp->next_desc_addr) + 1) / sizeof(hcf_16); + x.frag_buf[1].frag_addr = (hcf_8 *) descp->next_desc_addr->buf_addr ; + + hcf_put_info(&(lp->hcfCtx), (LTVP)&x); + } + */ desc_next = desc->next_desc_addr; /* Make sure the buffer isn't empty */ -- 1.7.9.5 -- To unsubscribe from this list: send the line "unsubscribe linux-usb" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
