aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Carpenter <dan.carpenter@oracle.com>2015-05-12 14:15:24 -0400
committerDavid S. Miller <davem@davemloft.net>2015-05-14 00:49:09 -0400
commita104a6b309715495ac29dd1ba9317a91a67e9808 (patch)
treec5e616e7060ebad0254c1209ed0ae3ac232ff658
parenta080e7bd0a8e56519d451eaea4ab05212d90e010 (diff)
net: macb: OR vs AND typos
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>
-rw-r--r--drivers/net/ethernet/cadence/macb.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/net/ethernet/cadence/macb.c b/drivers/net/ethernet/cadence/macb.c
index e7c10b0addb5..5fca3093747c 100644
--- a/drivers/net/ethernet/cadence/macb.c
+++ b/drivers/net/ethernet/cadence/macb.c
@@ -1644,7 +1644,7 @@ static void macb_init_hw(struct macb *bp)
1644 config |= MACB_BF(RBOF, NET_IP_ALIGN); /* Make eth data aligned */ 1644 config |= MACB_BF(RBOF, NET_IP_ALIGN); /* Make eth data aligned */
1645 config |= MACB_BIT(PAE); /* PAuse Enable */ 1645 config |= MACB_BIT(PAE); /* PAuse Enable */
1646 config |= MACB_BIT(DRFCS); /* Discard Rx FCS */ 1646 config |= MACB_BIT(DRFCS); /* Discard Rx FCS */
1647 if (bp->caps | MACB_CAPS_JUMBO) 1647 if (bp->caps & MACB_CAPS_JUMBO)
1648 config |= MACB_BIT(JFRAME); /* Enable jumbo frames */ 1648 config |= MACB_BIT(JFRAME); /* Enable jumbo frames */
1649 else 1649 else
1650 config |= MACB_BIT(BIG); /* Receive oversized frames */ 1650 config |= MACB_BIT(BIG); /* Receive oversized frames */
@@ -1656,12 +1656,12 @@ static void macb_init_hw(struct macb *bp)
1656 config |= MACB_BIT(NBC); /* No BroadCast */ 1656 config |= MACB_BIT(NBC); /* No BroadCast */
1657 config |= macb_dbw(bp); 1657 config |= macb_dbw(bp);
1658 macb_writel(bp, NCFGR, config); 1658 macb_writel(bp, NCFGR, config);
1659 if ((bp->caps | MACB_CAPS_JUMBO) && bp->jumbo_max_len) 1659 if ((bp->caps & MACB_CAPS_JUMBO) && bp->jumbo_max_len)
1660 gem_writel(bp, JML, bp->jumbo_max_len); 1660 gem_writel(bp, JML, bp->jumbo_max_len);
1661 bp->speed = SPEED_10; 1661 bp->speed = SPEED_10;
1662 bp->duplex = DUPLEX_HALF; 1662 bp->duplex = DUPLEX_HALF;
1663 bp->rx_frm_len_mask = MACB_RX_FRMLEN_MASK; 1663 bp->rx_frm_len_mask = MACB_RX_FRMLEN_MASK;
1664 if (bp->caps | MACB_CAPS_JUMBO) 1664 if (bp->caps & MACB_CAPS_JUMBO)
1665 bp->rx_frm_len_mask = MACB_RX_JFRMLEN_MASK; 1665 bp->rx_frm_len_mask = MACB_RX_JFRMLEN_MASK;
1666 1666
1667 macb_configure_dma(bp); 1667 macb_configure_dma(bp);
@@ -1875,7 +1875,7 @@ static int macb_change_mtu(struct net_device *dev, int new_mtu)
1875 return -EBUSY; 1875 return -EBUSY;
1876 1876
1877 max_mtu = ETH_DATA_LEN; 1877 max_mtu = ETH_DATA_LEN;
1878 if (bp->caps | MACB_CAPS_JUMBO) 1878 if (bp->caps & MACB_CAPS_JUMBO)
1879 max_mtu = gem_readl(bp, JML) - ETH_HLEN - ETH_FCS_LEN; 1879 max_mtu = gem_readl(bp, JML) - ETH_HLEN - ETH_FCS_LEN;
1880 1880
1881 if ((new_mtu > max_mtu) || (new_mtu < GEM_MTU_MIN_SIZE)) 1881 if ((new_mtu > max_mtu) || (new_mtu < GEM_MTU_MIN_SIZE))