iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

net: macb: OR vs AND typos

Browse Source 
The bitwise tests are always true here because it uses '|' where '&' is
intended.

Fixes: 98b5a0f4a228 ('net: macb: Add support for jumbo frames')
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Dan Carpenter 2015-05-12 21:15:24 +03:00 committed by David S. Miller
parent a080e7bd0a
commit a104a6b309
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/net/ethernet/cadence/macb.c
View File

@ -1644,7 +1644,7 @@ static void macb_init_hw(struct macb *bp)
config |= MACB_BF(RBOF, NET_IP_ALIGN); /* Make eth data aligned */ config |= MACB_BF(RBOF, NET_IP_ALIGN); /* Make eth data aligned */
config |= MACB_BIT(PAE); /* PAuse Enable */ config |= MACB_BIT(PAE); /* PAuse Enable */
config |= MACB_BIT(DRFCS); /* Discard Rx FCS */ config |= MACB_BIT(DRFCS); /* Discard Rx FCS */
if (bp->caps | MACB_CAPS_JUMBO) if (bp->caps & MACB_CAPS_JUMBO)
config |= MACB_BIT(JFRAME); /* Enable jumbo frames */ config |= MACB_BIT(JFRAME); /* Enable jumbo frames */
else else
config |= MACB_BIT(BIG); /* Receive oversized frames */ config |= MACB_BIT(BIG); /* Receive oversized frames */
@ -1656,12 +1656,12 @@ static void macb_init_hw(struct macb *bp)
config |= MACB_BIT(NBC); /* No BroadCast */ config |= MACB_BIT(NBC); /* No BroadCast */
config |= macb_dbw(bp); config |= macb_dbw(bp);
macb_writel(bp, NCFGR, config); macb_writel(bp, NCFGR, config);
if ((bp->caps | MACB_CAPS_JUMBO) && bp->jumbo_max_len) if ((bp->caps & MACB_CAPS_JUMBO) && bp->jumbo_max_len)
gem_writel(bp, JML, bp->jumbo_max_len); gem_writel(bp, JML, bp->jumbo_max_len);
bp->speed = SPEED_10; bp->speed = SPEED_10;
bp->duplex = DUPLEX_HALF; bp->duplex = DUPLEX_HALF;
bp->rx_frm_len_mask = MACB_RX_FRMLEN_MASK; bp->rx_frm_len_mask = MACB_RX_FRMLEN_MASK;
if (bp->caps | MACB_CAPS_JUMBO) if (bp->caps & MACB_CAPS_JUMBO)
bp->rx_frm_len_mask = MACB_RX_JFRMLEN_MASK; bp->rx_frm_len_mask = MACB_RX_JFRMLEN_MASK;
macb_configure_dma(bp); macb_configure_dma(bp);
@ -1875,7 +1875,7 @@ static int macb_change_mtu(struct net_device *dev, int new_mtu)
return -EBUSY; return -EBUSY;
max_mtu = ETH_DATA_LEN; max_mtu = ETH_DATA_LEN;
if (bp->caps | MACB_CAPS_JUMBO) if (bp->caps & MACB_CAPS_JUMBO)
max_mtu = gem_readl(bp, JML) - ETH_HLEN - ETH_FCS_LEN; max_mtu = gem_readl(bp, JML) - ETH_HLEN - ETH_FCS_LEN;
if ((new_mtu > max_mtu) || (new_mtu < GEM_MTU_MIN_SIZE)) if ((new_mtu > max_mtu) || (new_mtu < GEM_MTU_MIN_SIZE))