aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--epan/dissectors/packet-bootp.c2
-rw-r--r--epan/dissectors/packet-diameter-defs.h4
-rw-r--r--epan/dissectors/packet-eapol.c2
-rw-r--r--epan/dissectors/packet-ppp.c2
-rw-r--r--epan/dissectors/packet-radius.c4
-rw-r--r--epan/dissectors/packet-retix-bpdu.c2
-rw-r--r--epan/dissectors/packet-sflow.c8
-rw-r--r--epan/dissectors/packet-vlan.c2
8 files changed, 13 insertions, 13 deletions
diff --git a/epan/dissectors/packet-bootp.c b/epan/dissectors/packet-bootp.c
index 535908fa5e..6d45fc9069 100644
--- a/epan/dissectors/packet-bootp.c
+++ b/epan/dissectors/packet-bootp.c
@@ -2244,7 +2244,7 @@ dissect_docsis_cm_cap(proto_tree *v_tree, tvbuff_t *tvb, int voff, int len)
tvb_memcpy (tvb, asc_val, off + 4, 2);
raw_val = strtoul(asc_val, NULL, 16);
if (raw_val & 0x01)
- g_string_append(tlv_str, "802.1P filtering");
+ g_string_append(tlv_str, "802.1p filtering");
if (raw_val & 0x02) {
if (raw_val & 0x01)
g_string_append(tlv_str, ", ");
diff --git a/epan/dissectors/packet-diameter-defs.h b/epan/dissectors/packet-diameter-defs.h
index b416c6ed1e..edfbb1ff07 100644
--- a/epan/dissectors/packet-diameter-defs.h
+++ b/epan/dissectors/packet-diameter-defs.h
@@ -41,8 +41,8 @@ static const value_string diameter_service_type_vals[]={
{12,"Voice"}, /*[Chiba] */
{13,"Fax"}, /*[Chiba] */
{14,"Modem Relay"}, /*[Chiba] */
- {15,"IAPP-Register"}, /*[IEEE 802.11f][Kerry] */
- {16,"IAPP-AP-Check"}, /*[IEEE 802.11f][Kerry] */
+ {15,"IAPP-Register"}, /*[IEEE 802.11F][Kerry] */
+ {16,"IAPP-AP-Check"}, /*[IEEE 802.11F][Kerry] */
{17,"Authorize Only"}, /*[RFC3576] */
{0, (char *)NULL}
};
diff --git a/epan/dissectors/packet-eapol.c b/epan/dissectors/packet-eapol.c
index dc23000821..f98827415b 100644
--- a/epan/dissectors/packet-eapol.c
+++ b/epan/dissectors/packet-eapol.c
@@ -409,7 +409,7 @@ proto_register_eapol(void)
&ett_eapol_key_index
};
- proto_eapol = proto_register_protocol("802.1x Authentication", "EAPOL", "eapol");
+ proto_eapol = proto_register_protocol("802.1X Authentication", "EAPOL", "eapol");
proto_register_field_array(proto_eapol, hf, array_length(hf));
proto_register_subtree_array(ett, array_length(ett));
}
diff --git a/epan/dissectors/packet-ppp.c b/epan/dissectors/packet-ppp.c
index ae909f01c1..ec019f5332 100644
--- a/epan/dissectors/packet-ppp.c
+++ b/epan/dissectors/packet-ppp.c
@@ -245,7 +245,7 @@ const value_string ppp_vals[] = {
{PPP_NTCITS_IPI,"NTCITS IPI" },
{PPP_ML_SLCOMP, "single link compression in multilink" },
{PPP_COMP, "compressed packet" },
- {PPP_STP_HELLO, "802.1d Hello Packet" },
+ {PPP_STP_HELLO, "802.1D Hello Packet" },
{PPP_IBM_SR, "IBM Source Routing BPDU" },
{PPP_DEC_LB, "DEC LANBridge100 Spanning Tree"},
{PPP_CDP, "Cisco Discovery Protocol" },
diff --git a/epan/dissectors/packet-radius.c b/epan/dissectors/packet-radius.c
index 52976c8c42..ed6efe7a6d 100644
--- a/epan/dissectors/packet-radius.c
+++ b/epan/dissectors/packet-radius.c
@@ -346,8 +346,8 @@ static const value_string radius_service_type_vals[] =
{12, "Voice"}, /*[Chiba] */
{13, "Fax"}, /*[Chiba] */
{14, "Modem Relay"}, /*[Chiba] */
- {15, "IAPP-Register"}, /*[IEEE 802.11f][Kerry] */
- {16, "IAPP-AP-Check"}, /*[IEEE 802.11f][Kerry] */
+ {15, "IAPP-Register"}, /*[IEEE 802.11F][Kerry] */
+ {16, "IAPP-AP-Check"}, /*[IEEE 802.11F][Kerry] */
{17, "Authorize Only"}, /*[RFC3576] */
{0, NULL}
};
diff --git a/epan/dissectors/packet-retix-bpdu.c b/epan/dissectors/packet-retix-bpdu.c
index c5e2107009..7ed45b7cf8 100644
--- a/epan/dissectors/packet-retix-bpdu.c
+++ b/epan/dissectors/packet-retix-bpdu.c
@@ -51,7 +51,7 @@ static int hf_retix_bpdu_hello_time = -1;
static int hf_retix_bpdu_forward_delay = -1;
/* I don't have the spec's for this protcol so its been reverse engineered
- * It seems quite like 802.1d
+ * It seems quite like 802.1D
* It looks like the protocol version is specified in the ethernet trailer
* In the single packet I have the trailer is
* "RevC CBPDU"
diff --git a/epan/dissectors/packet-sflow.c b/epan/dissectors/packet-sflow.c
index 00c929c689..aedb28796c 100644
--- a/epan/dissectors/packet-sflow.c
+++ b/epan/dissectors/packet-sflow.c
@@ -281,8 +281,8 @@ static int hf_sflow_sampletype = -1;
static int hf_sflow_header = -1;
static int hf_sflow_packet_information_type = -1;
static int hf_sflow_extended_information_type = -1;
-static int hf_sflow_vlan_in = -1; /* incoming 802.1q VLAN ID */
-static int hf_sflow_vlan_out = -1; /* outgoing 802.1q VLAN ID */
+static int hf_sflow_vlan_in = -1; /* incoming 802.1Q VLAN ID */
+static int hf_sflow_vlan_out = -1; /* outgoing 802.1Q VLAN ID */
static int hf_sflow_pri_in = -1; /* incominging 802.1p priority */
static int hf_sflow_pri_out = -1; /* outgoing 802.1p priority */
static int hf_sflow_nexthop_v4 = -1; /* nexthop address */
@@ -937,12 +937,12 @@ proto_register_sflow(void)
"Type of extended information", HFILL }
},
{ &hf_sflow_vlan_in,
- { "Incoming 802.1q VLAN", "sflow.vlan.in",
+ { "Incoming 802.1Q VLAN", "sflow.vlan.in",
FT_UINT32, BASE_DEC, NULL, 0x0,
"Incoming VLAN ID", HFILL }
},
{ &hf_sflow_vlan_out,
- { "Outgoing 802.1q VLAN", "sflow.vlan.out",
+ { "Outgoing 802.1Q VLAN", "sflow.vlan.out",
FT_UINT32, BASE_DEC, NULL, 0x0,
"Outgoing VLAN ID", HFILL }
},
diff --git a/epan/dissectors/packet-vlan.c b/epan/dissectors/packet-vlan.c
index d9d423f411..bae7d8b03c 100644
--- a/epan/dissectors/packet-vlan.c
+++ b/epan/dissectors/packet-vlan.c
@@ -150,7 +150,7 @@ proto_register_vlan(void)
&ett_vlan,
};
- proto_vlan = proto_register_protocol("802.1q Virtual LAN", "VLAN", "vlan");
+ proto_vlan = proto_register_protocol("802.1Q Virtual LAN", "VLAN", "vlan");
proto_register_field_array(proto_vlan, hf, array_length(hf));
proto_register_subtree_array(ett, array_length(ett));
}