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

Commit e4477031 authored by Roland Dreier's avatar Roland Dreier
Browse files

RDMA/nes: Print IPv4 addresses in a readable format 



Use NIPQUAD_FMT instead of printing raw 32-bit hex quantities in
debugging output.

Acked-by: default avatarGlenn Streiff <gstreiff@neteffect.com>
Signed-off-by: default avatarRoland Dreier <rolandd@cisco.com>
parent 2bd01c5d

drivers/infiniband/hw/nes/nes.c

+3 −2
Original line number Diff line number Diff line
@@ -139,8 +139,9 @@ static int nes_inetaddr_event(struct notifier_block *notifier, 


	addr = ntohl(ifa->ifa_address);

	mask = ntohl(ifa->ifa_mask);

	nes_debug(NES_DBG_NETDEV, "nes_inetaddr_event: ip address %08X, netmask %08X.\n",

			addr, mask);

	nes_debug(NES_DBG_NETDEV, "nes_inetaddr_event: ip address " NIPQUAD_FMT

		  ", netmask " NIPQUAD_FMT ".\n",

		  HIPQUAD(addr), HIPQUAD(mask));

	list_for_each_entry(nesdev, &nes_dev_list, list) {

		nes_debug(NES_DBG_NETDEV, "Nesdev list entry = 0x%p. (%s)\n",

				nesdev, nesdev->netdev[0]->name);

drivers/infiniband/hw/nes/nes_cm.c

+7 −6
Original line number Diff line number Diff line
@@ -852,8 +852,8 @@ static struct nes_cm_node *find_node(struct nes_cm_core *cm_core, 
	/* get a handle on the hte */

	hte = &cm_core->connected_nodes;



	nes_debug(NES_DBG_CM, "Searching for an owner node:%x:%x from core %p->%p\n",

			loc_addr, loc_port, cm_core, hte);

	nes_debug(NES_DBG_CM, "Searching for an owner node: " NIPQUAD_FMT ":%x from core %p->%p\n",

		  HIPQUAD(loc_addr), loc_port, cm_core, hte);



	/* walk list and find cm_node associated with this session ID */

	spin_lock_irqsave(&cm_core->ht_lock, flags);
@@ -902,8 +902,8 @@ static struct nes_cm_listener *find_listener(struct nes_cm_core *cm_core, 
	}

	spin_unlock_irqrestore(&cm_core->listen_list_lock, flags);



	nes_debug(NES_DBG_CM, "Unable to find listener- %x:%x\n",

			dst_addr, dst_port);

	nes_debug(NES_DBG_CM, "Unable to find listener for " NIPQUAD_FMT ":%x\n",

		  HIPQUAD(dst_addr), dst_port);



	/* no listener */

	return NULL;
@@ -1067,8 +1067,9 @@ static struct nes_cm_node *make_cm_node(struct nes_cm_core *cm_core, 
	cm_node->loc_port = cm_info->loc_port;

	cm_node->rem_port = cm_info->rem_port;

	cm_node->send_write0 = send_first;

	nes_debug(NES_DBG_CM, "Make node addresses : loc = %x:%x, rem = %x:%x\n",

			cm_node->loc_addr, cm_node->loc_port, cm_node->rem_addr, cm_node->rem_port);

	nes_debug(NES_DBG_CM, "Make node addresses : loc = " NIPQUAD_FMT ":%x, rem = " NIPQUAD_FMT ":%x\n",

		  HIPQUAD(cm_node->loc_addr), cm_node->loc_port,

		  HIPQUAD(cm_node->rem_addr), cm_node->rem_port);

	cm_node->listener = listener;

	cm_node->netdev = nesvnic->netdev;

	cm_node->cm_id = cm_info->cm_id;

drivers/infiniband/hw/nes/nes_utils.c

+3 −1
Original line number Diff line number Diff line
@@ -660,7 +660,9 @@ int nes_arp_table(struct nes_device *nesdev, u32 ip_addr, u8 *mac_addr, u32 acti 


	/* DELETE or RESOLVE */

	if (arp_index == nesadapter->arp_table_size) {

		nes_debug(NES_DBG_NETDEV, "mac address not in ARP table - cannot delete or resolve\n");

		nes_debug(NES_DBG_NETDEV, "MAC for " NIPQUAD_FMT " not in ARP table - cannot %s\n",

			  HIPQUAD(ip_addr),

			  action == NES_ARP_RESOLVE ? "resolve" : "delete");

		return -1;

	}