| Message ID | 1267735244-8367-1-git-send-email-leitao@linux.vnet.ibm.com |
|---|---|
| State | Accepted, archived |
| Delegated to: | David Miller |
| Headers | show |
From: leitao@linux.vnet.ibm.com Date: Thu, 4 Mar 2010 15:40:44 -0500 > Currently s2io is dumping debug messages using the interface name > before it was allocated, showing a message like the following: > > s2io: eth%d: Ring Mem PHY: 0x7ef80000 > s2io: s2io_reset: Resetting XFrame card eth%d > > This patch just fixes it, printing the pci bus information for > the card instead of the interface name. > > Signed-off-by: Breno Leitao <leitao@linux.vnet.ibm.com> Applied, thanks. The netdev_*() printing macros we now have in linux/netdev.h allow to handle these cases transparently btw. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/net/s2io.c b/drivers/net/s2io.c index 3c4836d..2a913be 100644 --- a/drivers/net/s2io.c +++ b/drivers/net/s2io.c @@ -923,8 +923,8 @@ static int init_shared_mem(struct s2io_nic *nic) tmp_v_addr = mac_control->stats_mem; mac_control->stats_info = (struct stat_block *)tmp_v_addr; memset(tmp_v_addr, 0, size); - DBG_PRINT(INIT_DBG, "%s: Ring Mem PHY: 0x%llx\n", dev->name, - (unsigned long long)tmp_p_addr); + DBG_PRINT(INIT_DBG, "%s: Ring Mem PHY: 0x%llx\n", + dev_name(&nic->pdev->dev), (unsigned long long)tmp_p_addr); mac_control->stats_info->sw_stat.mem_allocated += mem_allocated; return SUCCESS; } @@ -3480,7 +3480,7 @@ static void s2io_reset(struct s2io_nic *sp) struct swStat *swstats; DBG_PRINT(INIT_DBG, "%s: Resetting XFrame card %s\n", - __func__, sp->dev->name); + __func__, pci_name(sp->pdev)); /* Back up the PCI-X CMD reg, dont want to lose MMRBC, OST settings */ pci_read_config_word(sp->pdev, PCIX_COMMAND_REGISTER, &(pci_cmd));
Currently s2io is dumping debug messages using the interface name before it was allocated, showing a message like the following: s2io: eth%d: Ring Mem PHY: 0x7ef80000 s2io: s2io_reset: Resetting XFrame card eth%d This patch just fixes it, printing the pci bus information for the card instead of the interface name. Signed-off-by: Breno Leitao <leitao@linux.vnet.ibm.com> --- drivers/net/s2io.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-)