diff options
Diffstat (limited to 'drivers/net/bnx2x_main.c')
-rw-r--r-- | drivers/net/bnx2x_main.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/drivers/net/bnx2x_main.c b/drivers/net/bnx2x_main.c index 1bbcdb22d96f..f285f0bbaa11 100644 --- a/drivers/net/bnx2x_main.c +++ b/drivers/net/bnx2x_main.c | |||
@@ -1858,14 +1858,14 @@ static int bnx2x_set_spio(struct bnx2x *bp, int spio_num, u32 mode) | |||
1858 | spio_reg = (REG_RD(bp, MISC_REG_SPIO) & MISC_REGISTERS_SPIO_FLOAT); | 1858 | spio_reg = (REG_RD(bp, MISC_REG_SPIO) & MISC_REGISTERS_SPIO_FLOAT); |
1859 | 1859 | ||
1860 | switch (mode) { | 1860 | switch (mode) { |
1861 | case MISC_REGISTERS_SPIO_OUTPUT_LOW : | 1861 | case MISC_REGISTERS_SPIO_OUTPUT_LOW: |
1862 | DP(NETIF_MSG_LINK, "Set SPIO %d -> output low\n", spio_num); | 1862 | DP(NETIF_MSG_LINK, "Set SPIO %d -> output low\n", spio_num); |
1863 | /* clear FLOAT and set CLR */ | 1863 | /* clear FLOAT and set CLR */ |
1864 | spio_reg &= ~(spio_mask << MISC_REGISTERS_SPIO_FLOAT_POS); | 1864 | spio_reg &= ~(spio_mask << MISC_REGISTERS_SPIO_FLOAT_POS); |
1865 | spio_reg |= (spio_mask << MISC_REGISTERS_SPIO_CLR_POS); | 1865 | spio_reg |= (spio_mask << MISC_REGISTERS_SPIO_CLR_POS); |
1866 | break; | 1866 | break; |
1867 | 1867 | ||
1868 | case MISC_REGISTERS_SPIO_OUTPUT_HIGH : | 1868 | case MISC_REGISTERS_SPIO_OUTPUT_HIGH: |
1869 | DP(NETIF_MSG_LINK, "Set SPIO %d -> output high\n", spio_num); | 1869 | DP(NETIF_MSG_LINK, "Set SPIO %d -> output high\n", spio_num); |
1870 | /* clear FLOAT and set SET */ | 1870 | /* clear FLOAT and set SET */ |
1871 | spio_reg &= ~(spio_mask << MISC_REGISTERS_SPIO_FLOAT_POS); | 1871 | spio_reg &= ~(spio_mask << MISC_REGISTERS_SPIO_FLOAT_POS); |
@@ -2759,7 +2759,7 @@ static void bnx2x_attn_int_deasserted(struct bnx2x *bp, u32 deasserted) | |||
2759 | HW_PRTY_ASSERT_SET_1) || | 2759 | HW_PRTY_ASSERT_SET_1) || |
2760 | (attn.sig[2] & group_mask.sig[2] & | 2760 | (attn.sig[2] & group_mask.sig[2] & |
2761 | HW_PRTY_ASSERT_SET_2)) | 2761 | HW_PRTY_ASSERT_SET_2)) |
2762 | BNX2X_ERR("FATAL HW block parity attention\n"); | 2762 | BNX2X_ERR("FATAL HW block parity attention\n"); |
2763 | } | 2763 | } |
2764 | } | 2764 | } |
2765 | 2765 | ||
@@ -2904,11 +2904,11 @@ static irqreturn_t bnx2x_msix_sp_int(int irq, void *dev_instance) | |||
2904 | /* underflow */ \ | 2904 | /* underflow */ \ |
2905 | d_hi = m_hi - s_hi; \ | 2905 | d_hi = m_hi - s_hi; \ |
2906 | if (d_hi > 0) { \ | 2906 | if (d_hi > 0) { \ |
2907 | /* we can 'loan' 1 */ \ | 2907 | /* we can 'loan' 1 */ \ |
2908 | d_hi--; \ | 2908 | d_hi--; \ |
2909 | d_lo = m_lo + (UINT_MAX - s_lo) + 1; \ | 2909 | d_lo = m_lo + (UINT_MAX - s_lo) + 1; \ |
2910 | } else { \ | 2910 | } else { \ |
2911 | /* m_hi <= s_hi */ \ | 2911 | /* m_hi <= s_hi */ \ |
2912 | d_hi = 0; \ | 2912 | d_hi = 0; \ |
2913 | d_lo = 0; \ | 2913 | d_lo = 0; \ |
2914 | } \ | 2914 | } \ |
@@ -2918,7 +2918,7 @@ static irqreturn_t bnx2x_msix_sp_int(int irq, void *dev_instance) | |||
2918 | d_hi = 0; \ | 2918 | d_hi = 0; \ |
2919 | d_lo = 0; \ | 2919 | d_lo = 0; \ |
2920 | } else { \ | 2920 | } else { \ |
2921 | /* m_hi >= s_hi */ \ | 2921 | /* m_hi >= s_hi */ \ |
2922 | d_hi = m_hi - s_hi; \ | 2922 | d_hi = m_hi - s_hi; \ |
2923 | d_lo = m_lo - s_lo; \ | 2923 | d_lo = m_lo - s_lo; \ |
2924 | } \ | 2924 | } \ |
@@ -3782,7 +3782,7 @@ static void bnx2x_stats_update(struct bnx2x *bp) | |||
3782 | bp->fp->rx_comp_cons), | 3782 | bp->fp->rx_comp_cons), |
3783 | le16_to_cpu(*bp->fp->rx_cons_sb), nstats->rx_packets); | 3783 | le16_to_cpu(*bp->fp->rx_cons_sb), nstats->rx_packets); |
3784 | printk(KERN_DEBUG " %s (Xoff events %u) brb drops %u\n", | 3784 | printk(KERN_DEBUG " %s (Xoff events %u) brb drops %u\n", |
3785 | netif_queue_stopped(bp->dev)? "Xoff" : "Xon", | 3785 | netif_queue_stopped(bp->dev) ? "Xoff" : "Xon", |
3786 | estats->driver_xoff, estats->brb_drop_lo); | 3786 | estats->driver_xoff, estats->brb_drop_lo); |
3787 | printk(KERN_DEBUG "tstats: checksum_discard %u " | 3787 | printk(KERN_DEBUG "tstats: checksum_discard %u " |
3788 | "packets_too_big_discard %u no_buff_discard %u " | 3788 | "packets_too_big_discard %u no_buff_discard %u " |
@@ -9610,7 +9610,7 @@ static int bnx2x_start_xmit(struct sk_buff *skb, struct net_device *dev) | |||
9610 | 9610 | ||
9611 | tx_bd->addr_hi = cpu_to_le32(U64_HI(mapping)); | 9611 | tx_bd->addr_hi = cpu_to_le32(U64_HI(mapping)); |
9612 | tx_bd->addr_lo = cpu_to_le32(U64_LO(mapping)); | 9612 | tx_bd->addr_lo = cpu_to_le32(U64_LO(mapping)); |
9613 | nbd = skb_shinfo(skb)->nr_frags + ((pbd == NULL)? 1 : 2); | 9613 | nbd = skb_shinfo(skb)->nr_frags + ((pbd == NULL) ? 1 : 2); |
9614 | tx_bd->nbd = cpu_to_le16(nbd); | 9614 | tx_bd->nbd = cpu_to_le16(nbd); |
9615 | tx_bd->nbytes = cpu_to_le16(skb_headlen(skb)); | 9615 | tx_bd->nbytes = cpu_to_le16(skb_headlen(skb)); |
9616 | 9616 | ||