Fix some items where mask was wider than field.

Detected by ./tools/check_typed_item_calls.py --mask

Error: epan/dissectors/packet-asterix.c filter= asterix.021_161_TN 0x0fff with len is 4 but type FT_UINT8  indicates max of 2 and extra digits are non-zero (0f)
Error: epan/dissectors/packet-capwap.c filter= capwap.control.message_element.ieee80211_station_session_key.flags_a 0x2000 with len is 4 but type FT_BOOLEAN  indicates max of 1 and extra digits are non-zero (200)
Error: epan/dissectors/packet-capwap.c filter= capwap.control.message_element.ieee80211_station_session_key.flags_c 0x1000 with len is 4 but type FT_BOOLEAN  indicates max of 1 and extra digits are non-zero (100)
Error: epan/dissectors/packet-cfdp.c filter= cfdp.trans_stat_2_b 0x6000 with len is 4 but type FT_UINT8  indicates max of 2 and extra digits are non-zero (60)
Error: epan/dissectors/packet-cfdp.c filter= cfdp.suspension_ind_b 0x8000 with len is 4 but type FT_UINT8  indicates max of 2 and extra digits are non-zero (80)
Error: epan/dissectors/packet-ixveriwave.c filter= ixveriwave.tx.factorydebug 0x7f80 with len is 4 but type FT_UINT8  indicates max of 2 and extra digits are non-zero (7f)

5 files changed, 7 insertions, 7 deletions

diff --git a/epan/dissectors/packet-asterix.c b/epan/dissectors/packet-asterix.c
index f0c9b20ee4..a26cc523fb 100644
--- a/epan/dissectors/packet-asterix.c
+++ b/epan/dissectors/packet-asterix.c
@@ -14324,7 +14324,7 @@ void proto_register_asterix (void)
         { &hf_021_160_GSPD, { "Ground speed [NM/s]", "asterix.021_160_GSPD", FT_DOUBLE, BASE_NONE, NULL, 0x0, NULL, HFILL } },
         { &hf_021_160_TA, { "Track angle [deg]", "asterix.021_160_TA", FT_DOUBLE, BASE_NONE, NULL, 0x0, NULL, HFILL } },
         { &hf_021_161, { "161, Track Number", "asterix.021_161", FT_NONE, BASE_NONE, NULL, 0x0, NULL, HFILL } },
-        { &hf_021_161_TN, { "TN", "asterix.021_161_TN", FT_UINT8, BASE_DEC, NULL, 0x0fff, NULL, HFILL } },
+        { &hf_021_161_TN, { "TN", "asterix.021_161_TN", FT_UINT16, BASE_DEC, NULL, 0x0fff, NULL, HFILL } },
         { &hf_021_165, { "165, Track Angle Rate", "asterix.021_165", FT_NONE, BASE_NONE, NULL, 0x0, NULL, HFILL } },
         { &hf_021_165_v0_2, { "165, Rate of Turn", "asterix.021_165", FT_NONE, BASE_NONE, NULL, 0x0, NULL, HFILL } },
         { &hf_021_165_TAR, { "TAR [deg/s]", "asterix.021_165_TAR", FT_DOUBLE, BASE_NONE, NULL, 0x0, NULL, HFILL } },
diff --git a/epan/dissectors/packet-capwap.c b/epan/dissectors/packet-capwap.c
index a15d3cd16e..95a19b5254 100644
--- a/epan/dissectors/packet-capwap.c
+++ b/epan/dissectors/packet-capwap.c
@@ -4717,12 +4717,12 @@ proto_register_capwap_control(void)
         },
         { &hf_capwap_msg_element_type_ieee80211_station_session_key_flags_a,
             { "Flag A", "capwap.control.message_element.ieee80211_station_session_key.flags_a",
-              FT_BOOLEAN, 1, NULL, 0x2000,
+              FT_BOOLEAN, 16, NULL, 0x2000,
               NULL, HFILL }
         },
         { &hf_capwap_msg_element_type_ieee80211_station_session_key_flags_c,
             { "Flag C", "capwap.control.message_element.ieee80211_station_session_key.flags_c",
-              FT_BOOLEAN, 1, NULL, 0x1000,
+              FT_BOOLEAN, 16, NULL, 0x1000,
               NULL, HFILL }
         },
         { &hf_capwap_msg_element_type_ieee80211_station_session_key_pairwire_tsc,
diff --git a/epan/dissectors/packet-cfdp.c b/epan/dissectors/packet-cfdp.c
index b21705fda6..7d6334d3c0 100644
--- a/epan/dissectors/packet-cfdp.c
+++ b/epan/dissectors/packet-cfdp.c
@@ -1753,7 +1753,7 @@ proto_register_cfdp(void)
         },
         { &hf_cfdp_trans_stat_2,
             { "Transaction status", "cfdp.trans_stat_2_b",
-            FT_UINT8, BASE_DEC, VALS(cfdp_trans_stat_ack), 0x6000,
+            FT_UINT8, BASE_DEC, VALS(cfdp_trans_stat_ack), 0x60,
             NULL, HFILL }
         },
         { &hf_cfdp_file_checksum,
@@ -1904,7 +1904,7 @@ proto_register_cfdp(void)
         },
         { &hf_cfdp_suspension_ind,
             {"Suspension indicator", "cfdp.suspension_ind_b",
-            FT_UINT8, BASE_DEC, VALS(cfdp_suspension_ind), 0x8000,
+            FT_UINT8, BASE_DEC, VALS(cfdp_suspension_ind), 0x80,
             NULL, HFILL}
         },
 
diff --git a/epan/dissectors/packet-ixveriwave.c b/epan/dissectors/packet-ixveriwave.c
index aec4411e6a..7843855a85 100644
--- a/epan/dissectors/packet-ixveriwave.c
+++ b/epan/dissectors/packet-ixveriwave.c
@@ -4201,7 +4201,7 @@ framing signal deasserted.  this is caused by software setting the drain all reg
         FT_UINT8, BASE_DEC, NULL, 0x1f, NULL, HFILL } },
     { &hf_radiotap_vw_tx_factorydebug,
         { "Factory Debug", "ixveriwave.tx.factorydebug",
-        FT_UINT8, BASE_HEX, NULL, 0x7f80, NULL, HFILL } },
+        FT_UINT16, BASE_HEX, NULL, 0x7f80, NULL, HFILL } },
     };
 
     static gint *ett[] = {
diff --git a/epan/dissectors/packet-opa-snc.c b/epan/dissectors/packet-opa-snc.c
index abc5b57673..e511858e14 100644
--- a/epan/dissectors/packet-opa-snc.c
+++ b/epan/dissectors/packet-opa-snc.c
@@ -312,7 +312,7 @@ void proto_register_opa_snc(void)
         },
         { &hf_opa_snc_rhf_eccerr, {
                 "Internal memory Uncorrectable error", "opa.snc.rhf.eccerr",
-                FT_BOOLEAN, 32, TFS(&tfs_error_ok), 0x200000000, NULL, HFILL }
+                FT_BOOLEAN, 32, TFS(&tfs_error_ok), 0x20000000, NULL, HFILL }
         },
         { &hf_opa_snc_rhf_lenerr, {
                 "Length Error", "opa.snc.rhf.lenerr",