From cab63b42cba6f787f013b724942b62e6576426ae Mon Sep 17 00:00:00 2001
From: Tijmen de Mes <tijmen@vck.utwente.nl>
Date: Tue, 28 Jun 2016 11:39:51 +0200
Subject: [PATCH 1/2] I agree to the conditions of the Contributor Agreement
 contained in doc/General/Contributing.md.

---
 AUTHORS.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/AUTHORS.md b/AUTHORS.md
index 3573dbecff..7ba1544467 100644
--- a/AUTHORS.md
+++ b/AUTHORS.md
@@ -107,6 +107,7 @@ LibreNMS contributors:
 - Josh Driver <keeperofdakeys@gmail.com> (keeperofdakeys)
 - Felix Eckhofer <felix@eckhofer.com> (tribut)
 - Vikram Adukia <adukia@dropbox.com> (justmedude) 
+- Tijmen de Mes <tijmen@ag-projects.com> (tijmenNL)
 
 [1]: http://observium.org/ "Observium web site"
 Observium was written by:

From fa94c8953cece1695f868fd75a557ee9f0600fbf Mon Sep 17 00:00:00 2001
From: Tijmen de Mes <tijmen@vck.utwente.nl>
Date: Tue, 28 Jun 2016 11:40:24 +0200
Subject: [PATCH 2/2] Fixed invalid query to get devices in networkmap when XDP
 is used.

---
 html/includes/print-map.inc.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/html/includes/print-map.inc.php b/html/includes/print-map.inc.php
index 12107d567c..c0d0cf2f82 100644
--- a/html/includes/print-map.inc.php
+++ b/html/includes/print-map.inc.php
@@ -127,7 +127,7 @@ if (in_array('xdp', $config['network_map_items'])) {
                       WHERE
                              `active`=1 AND
                              `local_device_id` != 0 AND
-                             `remote_device_id` != 0 AND
+                             `remote_device_id` != 0
                              $where
                              $sql
                       GROUP BY `P1`.`port_id`,`P2`.`port_id`