From 69547671c0f052ecaa9dcf0cb09f4431aa0c08d0 Mon Sep 17 00:00:00 2001
From: Adam Amstrong <adama@localhost>
Date: Thu, 27 Oct 2011 11:21:26 +0000
Subject: [PATCH] fix VLAN on cisco.

git-svn-id: http://www.observium.org/svn/observer/trunk@2703 61d68cd4-352d-0410-923a-c4978735b2b8
---
 includes/polling/ports.inc.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/includes/polling/ports.inc.php b/includes/polling/ports.inc.php
index db02ac88a..40f14605f 100755
--- a/includes/polling/ports.inc.php
+++ b/includes/polling/ports.inc.php
@@ -198,15 +198,17 @@ foreach ($ports as $port)
     if (isset($this_port['vlanTrunkPortEncapsulationOperType']) && $this_port['vlanTrunkPortEncapsulationOperType'] != "notApplicable")
     {
       $this_port['ifTrunk'] = $this_port['vlanTrunkPortEncapsulationOperType'];
+      if (isset($this_port['vlanTrunkPortNativeVlan'])) { $this_port['ifVlan'] = $this_port['vlanTrunkPortNativeVlan']; }
     }
     $this_port['ifVlan']  = $this_port['vmVlan'];
-    if (isset($this_port['vlanTrunkPortNativeVlan'])) { $this_port['ifVlan'] = $this_port['vlanTrunkPortNativeVlan']; }
 
     if (!isset($this_port['ifVlan']) && isset($this_port['dot1qPvid']))
     {
       $this_port['ifVlan'] = $this_port['dot1qPvid'];
     }
 
+    echo("VLAN == ".$this_port['ifVlan']);
+
     /// Update IF-MIB data
     foreach ($data_oids as $oid)
     {