Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3a22813a authored by Breno Leitao's avatar Breno Leitao Committed by David S. Miller
Browse files

s2io: Fixing debug message 



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: default avatarBreno Leitao <leitao@linux.vnet.ibm.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent a80483d3

drivers/net/s2io.c

+3 −3
Original line number Diff line number Diff line
@@ -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));