ixgbe: Fix output from ixgbe_dump
authorAlexander Duyck <alexander.h.duyck@intel.com>
Thu, 2 Mar 2017 23:01:36 +0000 (15:01 -0800)
committerJeff Kirsher <jeffrey.t.kirsher@intel.com>
Tue, 18 Apr 2017 22:27:33 +0000 (15:27 -0700)
I just found that when we had changed the Rx path to check for length
instead of the DD bit we introduced an issue in ixgbe_dump since we were no
longer clearing the status bits.

To correct this I am updating ixgbe_dump to look for the length bits in the
descriptor since that is what we are using in the Rx path.

Fixes: c3630cc40b4f ("ixgbe: Use length to determine if descriptor is done")
Signed-off-by: Alexander Duyck <alexander.h.duyck@intel.com>
Tested-by: Andrew Bowers <andrewx.bowers@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
drivers/net/ethernet/intel/ixgbe/ixgbe_main.c

index 536dd9b1ad97cd5167ad4abdaad78f29c80a94a9..afff2ca7f8c0d784d51f8232b0665aaa746151b3 100644 (file)
@@ -606,7 +606,6 @@ static void ixgbe_dump(struct ixgbe_adapter *adapter)
        struct ixgbe_ring *rx_ring;
        union ixgbe_adv_rx_desc *rx_desc;
        struct ixgbe_rx_buffer *rx_buffer_info;
-       u32 staterr;
        int i = 0;
 
        if (!netif_msg_hw(adapter))
@@ -827,8 +826,7 @@ rx_ring_summary:
                        rx_buffer_info = &rx_ring->rx_buffer_info[i];
                        rx_desc = IXGBE_RX_DESC(rx_ring, i);
                        u0 = (struct my_u0 *)rx_desc;
-                       staterr = le32_to_cpu(rx_desc->wb.upper.status_error);
-                       if (staterr & IXGBE_RXD_STAT_DD) {
+                       if (rx_desc->wb.upper.length) {
                                /* Descriptor Done */
                                pr_info("RWB[0x%03X]     %016llX %016llX ---------------- %p%s\n",
                                        i,