Rename frame relay NLPID dissector table from "fr.ietf" to "fr.nlpid".

svn path=/trunk/; revision=51960

6 files changed, 6 insertions, 6 deletions

diff --git a/epan/dissectors/packet-fr.c b/epan/dissectors/packet-fr.c
index 46d7bd9d1a..b19171e07b 100644
--- a/epan/dissectors/packet-fr.c
+++ b/epan/dissectors/packet-fr.c
@@ -965,7 +965,7 @@ proto_register_fr(void)
   proto_register_field_array(proto_fr, hf, array_length(hf));
   proto_register_subtree_array(ett, array_length(ett));
 
-  fr_subdissector_table = register_dissector_table("fr.ietf",
+  fr_subdissector_table = register_dissector_table("fr.nlpid",
                                                    "Frame Relay NLPID", FT_UINT8, BASE_HEX);
   fr_osinl_subdissector_table = register_dissector_table("fr.osinl",
                                                          "Frame Relay OSI NLPID", FT_UINT8, BASE_HEX);
diff --git a/epan/dissectors/packet-ip.c b/epan/dissectors/packet-ip.c
index c4f27fbb03..cce3ad730d 100644
--- a/epan/dissectors/packet-ip.c
+++ b/epan/dissectors/packet-ip.c
@@ -3064,7 +3064,7 @@ proto_reg_handoff_ip(void)
   dissector_add_uint("null.type", BSD_AF_INET, ip_handle);
   dissector_add_uint("chdlc.protocol", ETHERTYPE_IP, ip_handle);
   dissector_add_uint("osinl.excl", NLPID_IP, ip_handle);
-  dissector_add_uint("fr.ietf", NLPID_IP, ip_handle);
+  dissector_add_uint("fr.nlpid", NLPID_IP, ip_handle);
   dissector_add_uint("x.25.spi", NLPID_IP, ip_handle);
   dissector_add_uint("arcnet.protocol_id", ARCNET_PROTO_IP_1051, ip_handle);
   dissector_add_uint("arcnet.protocol_id", ARCNET_PROTO_IP_1201, ip_handle);
diff --git a/epan/dissectors/packet-ipv6.c b/epan/dissectors/packet-ipv6.c
index 2f656f28a5..5e0ae8792b 100644
--- a/epan/dissectors/packet-ipv6.c
+++ b/epan/dissectors/packet-ipv6.c
@@ -2901,7 +2901,7 @@ proto_reg_handoff_ipv6(void)
   dissector_add_uint("null.type", BSD_AF_INET6_FREEBSD, ipv6_handle);
   dissector_add_uint("null.type", BSD_AF_INET6_DARWIN, ipv6_handle);
   dissector_add_uint("chdlc.protocol", ETHERTYPE_IPv6, ipv6_handle);
-  dissector_add_uint("fr.ietf", NLPID_IP6, ipv6_handle);
+  dissector_add_uint("fr.nlpid", NLPID_IP6, ipv6_handle);
   dissector_add_uint("osinl.excl", NLPID_IP6, ipv6_handle);
   dissector_add_uint("x.25.spi", NLPID_IP6, ipv6_handle);
   dissector_add_uint("arcnet.protocol_id", ARCNET_PROTO_IPv6, ipv6_handle);
diff --git a/epan/dissectors/packet-lmi.c b/epan/dissectors/packet-lmi.c
index 12061aed54..9241a76986 100644
--- a/epan/dissectors/packet-lmi.c
+++ b/epan/dissectors/packet-lmi.c
@@ -245,5 +245,5 @@ proto_reg_handoff_lmi(void)
 	dissector_handle_t lmi_handle;
 
 	lmi_handle = create_dissector_handle(dissect_lmi, proto_lmi);
-	dissector_add_uint("fr.ietf", NLPID_LMI, lmi_handle);
+	dissector_add_uint("fr.nlpid", NLPID_LMI, lmi_handle);
 }
diff --git a/epan/dissectors/packet-ppp.c b/epan/dissectors/packet-ppp.c
index 9f48aae0cf..b39c472f38 100644
--- a/epan/dissectors/packet-ppp.c
+++ b/epan/dissectors/packet-ppp.c
@@ -5539,7 +5539,7 @@ proto_reg_handoff_ppp(void)
     data_handle = find_dissector("data");
 
     ppp_handle = find_dissector("ppp");
-    dissector_add_uint("fr.ietf", NLPID_PPP, ppp_handle);
+    dissector_add_uint("fr.nlpid", NLPID_PPP, ppp_handle);
 
     ppp_hdlc_handle = find_dissector("ppp_hdlc");
     dissector_add_uint("wtap_encap", WTAP_ENCAP_PPP, ppp_hdlc_handle);
diff --git a/epan/dissectors/packet-wcp.c b/epan/dissectors/packet-wcp.c
index 827de75c30..8c1c0e436c 100644
--- a/epan/dissectors/packet-wcp.c
+++ b/epan/dissectors/packet-wcp.c
@@ -723,6 +723,6 @@ proto_reg_handoff_wcp(void) {
     fr_uncompressed_handle = find_dissector("fr_uncompressed");
 
     wcp_handle = create_dissector_handle(dissect_wcp, proto_wcp);
-    dissector_add_uint("fr.ietf", NLPID_COMPRESSED, wcp_handle);
+    dissector_add_uint("fr.nlpid", NLPID_COMPRESSED, wcp_handle);
     dissector_add_uint("ethertype",  ETHERTYPE_WCP, wcp_handle);
 }