diff options
| author | Bill Meier <wmeier@newsguy.com> | 2008-09-03 16:42:35 +0000 |
|---|---|---|
| committer | Bill Meier <wmeier@newsguy.com> | 2008-09-03 16:42:35 +0000 |
| commit | 419e3a47f6a9c887edc949235dc0755a98d4c4ee (patch) | |
| tree | 0cba41be21c97f7851f13844ce71399d7be20e97 /epan/dissectors/packet-ieee8021ah.c | |
| parent | af49f0161686d18f45b749d96eaf431ce45625d0 (diff) | |
| download | wireshark-419e3a47f6a9c887edc949235dc0755a98d4c4ee.tar.gz wireshark-419e3a47f6a9c887edc949235dc0755a98d4c4ee.tar.bz2 wireshark-419e3a47f6a9c887edc949235dc0755a98d4c4ee.zip | |
Cleanup related to prefs & proto_reg_handoff
svn path=/trunk/; revision=26128
Diffstat (limited to 'epan/dissectors/packet-ieee8021ah.c')
| -rw-r--r-- | epan/dissectors/packet-ieee8021ah.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/epan/dissectors/packet-ieee8021ah.c b/epan/dissectors/packet-ieee8021ah.c index e9c207996b..ba1f1a690d 100644 --- a/epan/dissectors/packet-ieee8021ah.c +++ b/epan/dissectors/packet-ieee8021ah.c @@ -45,7 +45,6 @@ void dissect_ieee8021ah_common(tvbuff_t *tvb, packet_info *pinfo, /* ethertype for 802.1ah tag - encapsulating an Ethernet packet */ static unsigned int ieee8021ah_ethertype = ETHERTYPE_IEEE_802_1AH; -static unsigned int old_ieee8021ah_ethertype; static int proto_ieee8021ah = -1; static int proto_ieee8021ad = -1; @@ -434,6 +433,7 @@ proto_reg_handoff_ieee8021ah(void) static gboolean prefs_initialized = FALSE; static dissector_handle_t ieee8021ah_handle; static dissector_handle_t ieee8021ad_handle; + static unsigned int old_ieee8021ah_ethertype; if (!prefs_initialized){ ieee8021ah_handle = create_dissector_handle(dissect_ieee8021ah, @@ -441,6 +441,7 @@ proto_reg_handoff_ieee8021ah(void) ieee8021ad_handle = create_dissector_handle(dissect_ieee8021ad, proto_ieee8021ad); + dissector_add("ethertype", ETHERTYPE_IEEE_802_1AD, ieee8021ad_handle); prefs_initialized = TRUE; } @@ -451,5 +452,4 @@ proto_reg_handoff_ieee8021ah(void) old_ieee8021ah_ethertype = ieee8021ah_ethertype; dissector_add("ethertype", ieee8021ah_ethertype, ieee8021ah_handle); - dissector_add("ethertype", ETHERTYPE_IEEE_802_1AD, ieee8021ad_handle); } |