From 7b7f197439e190ed91518cefb407027e2813a41c Mon Sep 17 00:00:00 2001
From: "Eric A. Miller" <emiller@cpan.org>
Date: Mon, 8 Dec 2014 21:12:01 -0500
Subject: [PATCH] Fix Cisco VLAN membership issue introduced in 3.22 related to
 capturing port VLANs on Cisco interfaces which are configured for trunking
 but are not in operational trunking mode

---
 ChangeLog        | 6 ++++++
 Info/CiscoVTP.pm | 4 ++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index b8ca228f..482de817 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -7,6 +7,12 @@ version 3.23
     * Update MIB used in L1::Asante
     * Enhanced STP support for L3::Extreme
 
+   [BUG FIXES]
+
+    * Fix Cisco VLAN membership issue introduced in 3.22 related to capturing
+      port VLANs on Cisco interfaces which are configured for trunking but
+      are not in operational trunking mode
+
 version 3.22 (2014-12-02)
 
    [ENHANCEMENTS]
diff --git a/Info/CiscoVTP.pm b/Info/CiscoVTP.pm
index 51a83830..32b339ff 100644
--- a/Info/CiscoVTP.pm
+++ b/Info/CiscoVTP.pm
@@ -235,8 +235,8 @@ sub i_vlan_membership {
     foreach my $port ( keys %$i_vlan ) {
         my $vlan = $i_vlan->{$port};
         next unless defined $vlan;
-        my $stat = $trunk_dyn_stat->{$port};
-        if ( defined $stat and $stat =~ /notTrunking/ ) {
+        my $dyn = $trunk_dyn->{$port};
+        unless ($dyn and (($dyn eq 'on') or ($dyn eq 'onNoNegotiate'))) {
             push( @{ $i_vlan_membership->{$port} }, $vlan );
         }
     }