From c1f8a5c2ae0e8999d67f49bd1144bc18c164a01f Mon Sep 17 00:00:00 2001
From: Paul Gear <github@libertysys.com.au>
Date: Sat, 2 Nov 2013 16:42:05 +1000
Subject: [PATCH] Really really fix ARP discovery:

- Observium current humanize_port -> ifLabel
- Another reference to ip_address
---
 includes/discovery/discovery-arp.inc.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/includes/discovery/discovery-arp.inc.php b/includes/discovery/discovery-arp.inc.php
index d08ff6880..7a312dd52 100644
--- a/includes/discovery/discovery-arp.inc.php
+++ b/includes/discovery/discovery-arp.inc.php
@@ -44,10 +44,10 @@ foreach (dbFetchRows($sql, array($deviceid)) as $entry)
 {
 	global $config;
 
-	$ip = $entry['ip_address'];
+	$ip = $entry['ipv4_address'];
 	$mac = $entry['mac_address'];
 	$if = $entry['port_id'];
-	$int = humanize_port($if);
+	$int = ifLabel($if);
 	$label = $int['label'];
 
 	// Even though match_network is done inside discover_new_device, we do it here