diff options
Diffstat (limited to 'drivers/net/ethernet/intel/igb/igb_main.c')
| -rw-r--r-- | drivers/net/ethernet/intel/igb/igb_main.c | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/drivers/net/ethernet/intel/igb/igb_main.c b/drivers/net/ethernet/intel/igb/igb_main.c index b7c2d5050572..48cc4fb1a307 100644 --- a/drivers/net/ethernet/intel/igb/igb_main.c +++ b/drivers/net/ethernet/intel/igb/igb_main.c | |||
| @@ -462,10 +462,10 @@ static void igb_dump(struct igb_adapter *adapter) | |||
| 462 | (u64)buffer_info->time_stamp, | 462 | (u64)buffer_info->time_stamp, |
| 463 | buffer_info->skb, next_desc); | 463 | buffer_info->skb, next_desc); |
| 464 | 464 | ||
| 465 | if (netif_msg_pktdata(adapter) && buffer_info->dma != 0) | 465 | if (netif_msg_pktdata(adapter) && buffer_info->skb) |
| 466 | print_hex_dump(KERN_INFO, "", | 466 | print_hex_dump(KERN_INFO, "", |
| 467 | DUMP_PREFIX_ADDRESS, | 467 | DUMP_PREFIX_ADDRESS, |
| 468 | 16, 1, phys_to_virt(buffer_info->dma), | 468 | 16, 1, buffer_info->skb->data, |
| 469 | buffer_info->length, true); | 469 | buffer_info->length, true); |
| 470 | } | 470 | } |
| 471 | } | 471 | } |
| @@ -547,18 +547,17 @@ rx_ring_summary: | |||
| 547 | (u64)buffer_info->dma, | 547 | (u64)buffer_info->dma, |
| 548 | buffer_info->skb, next_desc); | 548 | buffer_info->skb, next_desc); |
| 549 | 549 | ||
| 550 | if (netif_msg_pktdata(adapter)) { | 550 | if (netif_msg_pktdata(adapter) && |
| 551 | buffer_info->dma && buffer_info->skb) { | ||
| 551 | print_hex_dump(KERN_INFO, "", | 552 | print_hex_dump(KERN_INFO, "", |
| 552 | DUMP_PREFIX_ADDRESS, | 553 | DUMP_PREFIX_ADDRESS, |
| 553 | 16, 1, | 554 | 16, 1, buffer_info->skb->data, |
| 554 | phys_to_virt(buffer_info->dma), | 555 | IGB_RX_HDR_LEN, true); |
| 555 | IGB_RX_HDR_LEN, true); | ||
| 556 | print_hex_dump(KERN_INFO, "", | 556 | print_hex_dump(KERN_INFO, "", |
| 557 | DUMP_PREFIX_ADDRESS, | 557 | DUMP_PREFIX_ADDRESS, |
| 558 | 16, 1, | 558 | 16, 1, |
| 559 | phys_to_virt( | 559 | page_address(buffer_info->page) + |
| 560 | buffer_info->page_dma + | 560 | buffer_info->page_offset, |
| 561 | buffer_info->page_offset), | ||
| 562 | PAGE_SIZE/2, true); | 561 | PAGE_SIZE/2, true); |
| 563 | } | 562 | } |
| 564 | } | 563 | } |