Remove some unused hf entries.

svn path=/trunk/; revision=34549

28 files changed, 0 insertions, 168 deletions

diff --git a/plugins/docsis/packet-bintrngreq.c b/plugins/docsis/packet-bintrngreq.c
index d00b5a2641..2e822a5112 100644
--- a/plugins/docsis/packet-bintrngreq.c
+++ b/plugins/docsis/packet-bintrngreq.c
@@ -31,7 +31,6 @@
 
 /* Initialize the protocol and registered fields */
 static int proto_docsis_bintrngreq = -1;
-static int hf_docsis_bintrngreq = -1;
 static int hf_docsis_bintrngreq_down_chid = -1;
 static int hf_docsis_bintrngreq_mddsgid = -1;
 static int hf_docsis_bintrngreq_capflags = -1;
@@ -93,11 +92,6 @@ proto_register_docsis_bintrngreq (void)
 {
   /* Setup list of header fields  See Section 1.6.1 for details*/
   static hf_register_info hf[] = {
-    {&hf_docsis_bintrngreq,
-     {"RNG-REQ Message", "docsis_bintrngreq",
-      FT_BYTES, BASE_NONE, NULL, 0x0,
-      "Ranging Request Message", HFILL}
-    },
     {&hf_docsis_bintrngreq_capflags,
      {"Capability Flags", "docsis_bintrngreq.capflags",
       FT_UINT8, BASE_HEX, NULL, 0x0,
diff --git a/plugins/docsis/packet-bpkmattr.c b/plugins/docsis/packet-bpkmattr.c
index 28a0f01f47..85e44412ff 100644
--- a/plugins/docsis/packet-bpkmattr.c
+++ b/plugins/docsis/packet-bpkmattr.c
@@ -65,7 +65,6 @@
 
 /* Initialize the protocol and registered fields */
 static int proto_docsis_bpkmattr = -1;
-static int hf_docsis_bpkmattr = -1;
 static int hf_docsis_bpkmattr_serial_num = -1;
 static int hf_docsis_bpkmattr_manf_id = -1;
 static int hf_docsis_bpkmattr_mac_addr = -1;
@@ -389,11 +388,6 @@ proto_register_docsis_bpkmattr (void)
 
 /* Setup list of header fields  See Section 1.6.1 for details*/
   static hf_register_info hf[] = {
-    {&hf_docsis_bpkmattr,
-     {"BPKM Attributes", "docsis_bpkmattr",
-      FT_BYTES, BASE_NONE, NULL, 0x0,
-      NULL, HFILL}
-     },
     {&hf_docsis_bpkmattr_serial_num,
      {"1 Serial Number", "docsis_bpkmattr.serialnum",
       FT_STRING, BASE_NONE, NULL, 0x0,
diff --git a/plugins/docsis/packet-bpkmreq.c b/plugins/docsis/packet-bpkmreq.c
index 7f3785101b..5119bc5ce3 100644
--- a/plugins/docsis/packet-bpkmreq.c
+++ b/plugins/docsis/packet-bpkmreq.c
@@ -31,7 +31,6 @@
 
 /* Initialize the protocol and registered fields */
 static int proto_docsis_bpkmreq = -1;
-static int hf_docsis_bpkmreq = -1;
 static int hf_docsis_bpkmreq_code = -1;
 static int hf_docsis_bpkmreq_length = -1;
 static int hf_docsis_bpkmreq_ident = -1;
@@ -115,11 +114,6 @@ proto_register_docsis_bpkmreq (void)
 
 /* Setup list of header fields  See Section 1.6.1 for details*/
   static hf_register_info hf[] = {
-    {&hf_docsis_bpkmreq,
-     {"BPKM Request Message", "docsis_bpkmreq",
-      FT_BYTES, BASE_NONE, NULL, 0x0,
-      NULL, HFILL}
-     },
     {&hf_docsis_bpkmreq_code,
      {"BPKM Code", "docsis_bpkmreq.code",
       FT_UINT8, BASE_DEC, VALS (code_field_vals), 0x0,
diff --git a/plugins/docsis/packet-bpkmrsp.c b/plugins/docsis/packet-bpkmrsp.c
index c92e5f2bce..9e65816ce7 100644
--- a/plugins/docsis/packet-bpkmrsp.c
+++ b/plugins/docsis/packet-bpkmrsp.c
@@ -31,7 +31,6 @@
 
 /* Initialize the protocol and registered fields */
 static int proto_docsis_bpkmrsp = -1;
-static int hf_docsis_bpkmrsp = -1;
 static int hf_docsis_bpkmrsp_code = -1;
 static int hf_docsis_bpkmrsp_length = -1;
 static int hf_docsis_bpkmrsp_ident = -1;
@@ -113,11 +112,6 @@ proto_register_docsis_bpkmrsp (void)
 
 /* Setup list of header fields  See Section 1.6.1 for details*/
   static hf_register_info hf[] = {
-    {&hf_docsis_bpkmrsp,
-     {"BPKM Response Message", "docsis_bpkmrsp",
-      FT_BYTES, BASE_NONE, NULL, 0x0,
-      NULL, HFILL}
-     },
     {&hf_docsis_bpkmrsp_code,
      {"BPKM Code", "docsis_bpkmrsp.code",
       FT_UINT8, BASE_DEC, VALS (code_field_vals), 0x0,
diff --git a/plugins/docsis/packet-dsaack.c b/plugins/docsis/packet-dsaack.c
index 0bea9056c1..54ea240ce3 100644
--- a/plugins/docsis/packet-dsaack.c
+++ b/plugins/docsis/packet-dsaack.c
@@ -31,7 +31,6 @@
 
 /* Initialize the protocol and registered fields */
 static int proto_docsis_dsaack = -1;
-static int hf_docsis_dsaack = -1;
 static int hf_docsis_dsaack_tranid = -1;
 static int hf_docsis_dsaack_response = -1;
 static dissector_handle_t docsis_tlv_handle;
@@ -93,11 +92,6 @@ proto_register_docsis_dsaack (void)
 
 /* Setup list of header fields  See Section 1.6.1 for details*/
   static hf_register_info hf[] = {
-    {&hf_docsis_dsaack,
-     {"Dynamic Service Add Ack", "docsis_dsaack",
-      FT_BYTES, BASE_NONE, NULL, 0x0,
-      "Dynamic Service Add Request", HFILL}
-     },
     {&hf_docsis_dsaack_tranid,
      {"Transaction Id", "docsis_dsaack.tranid",
       FT_UINT16, BASE_DEC, NULL, 0x0,
diff --git a/plugins/docsis/packet-dsareq.c b/plugins/docsis/packet-dsareq.c
index e5490cd042..024a10aea7 100644
--- a/plugins/docsis/packet-dsareq.c
+++ b/plugins/docsis/packet-dsareq.c
@@ -31,7 +31,6 @@
 
 /* Initialize the protocol and registered fields */
 static int proto_docsis_dsareq = -1;
-static int hf_docsis_dsareq = -1;
 static int hf_docsis_dsareq_tranid = -1;
 static dissector_handle_t docsis_tlv_handle;
 
@@ -87,11 +86,6 @@ proto_register_docsis_dsareq (void)
 
 /* Setup list of header fields  See Section 1.6.1 for details*/
   static hf_register_info hf[] = {
-    {&hf_docsis_dsareq,
-     {"Dynamic Service Addition Request", "docsis_dsareq",
-      FT_BYTES, BASE_NONE, NULL, 0x0,
-      NULL, HFILL}
-     },
     {&hf_docsis_dsareq_tranid,
      {"Transaction Id", "docsis_dsareq.tranid",
       FT_UINT16, BASE_DEC, NULL, 0x0,
diff --git a/plugins/docsis/packet-dsarsp.c b/plugins/docsis/packet-dsarsp.c
index 22ef39e6e5..f695827ca2 100644
--- a/plugins/docsis/packet-dsarsp.c
+++ b/plugins/docsis/packet-dsarsp.c
@@ -31,7 +31,6 @@
 
 /* Initialize the protocol and registered fields */
 static int proto_docsis_dsarsp = -1;
-static int hf_docsis_dsarsp = -1;
 static int hf_docsis_dsarsp_tranid = -1;
 static int hf_docsis_dsarsp_response = -1;
 static dissector_handle_t docsis_tlv_handle;
@@ -96,11 +95,6 @@ proto_register_docsis_dsarsp (void)
 
 /* Setup list of header fields  See Section 1.6.1 for details*/
   static hf_register_info hf[] = {
-    {&hf_docsis_dsarsp,
-     {"Dynamic Service Add Request", "docsis_dsarsp",
-      FT_BYTES, BASE_NONE, NULL, 0x0,
-      NULL, HFILL}
-     },
     {&hf_docsis_dsarsp_tranid,
      {"Transaction Id", "docsis_dsarsp.tranid",
       FT_UINT16, BASE_DEC, NULL, 0x0,
diff --git a/plugins/docsis/packet-dscack.c b/plugins/docsis/packet-dscack.c
index 7e8982cccf..cacd65d33a 100644
--- a/plugins/docsis/packet-dscack.c
+++ b/plugins/docsis/packet-dscack.c
@@ -31,7 +31,6 @@
 
 /* Initialize the protocol and registered fields */
 static int proto_docsis_dscack = -1;
-static int hf_docsis_dscack = -1;
 static int hf_docsis_dscack_tranid = -1;
 static int hf_docsis_dscack_response = -1;
 static dissector_handle_t docsis_tlv_handle;
@@ -95,11 +94,6 @@ proto_register_docsis_dscack (void)
 
 /* Setup list of header fields  See Section 1.6.1 for details*/
   static hf_register_info hf[] = {
-    {&hf_docsis_dscack,
-     {"Dynamic Service Change Ack", "docsis_dscack",
-      FT_BYTES, BASE_NONE, NULL, 0x0,
-      "Dynamic Service Add Request", HFILL}
-     },
     {&hf_docsis_dscack_tranid,
      {"Transaction Id", "docsis_dscack.tranid",
       FT_UINT16, BASE_DEC, NULL, 0x0,
diff --git a/plugins/docsis/packet-dscreq.c b/plugins/docsis/packet-dscreq.c
index ddd342cfa4..d4fbe90a3d 100644
--- a/plugins/docsis/packet-dscreq.c
+++ b/plugins/docsis/packet-dscreq.c
@@ -31,7 +31,6 @@
 
 /* Initialize the protocol and registered fields */
 static int proto_docsis_dscreq = -1;
-static int hf_docsis_dscreq = -1;
 static int hf_docsis_dscreq_tranid = -1;
 static dissector_handle_t docsis_tlv_handle;
 
@@ -88,11 +87,6 @@ proto_register_docsis_dscreq (void)
 
 /* Setup list of header fields  See Section 1.6.1 for details*/
   static hf_register_info hf[] = {
-    {&hf_docsis_dscreq,
-     {"Dynamic Service Change Request", "docsis_dscreq",
-      FT_BYTES, BASE_NONE, NULL, 0x0,
-      "Dynamic Service Addition Request", HFILL}
-     },
     {&hf_docsis_dscreq_tranid,
      {"Transaction Id", "docsis_dscreq.tranid",
       FT_UINT16, BASE_DEC, NULL, 0x0,
diff --git a/plugins/docsis/packet-dscrsp.c b/plugins/docsis/packet-dscrsp.c
index 6e85f42af0..72e06bb094 100644
--- a/plugins/docsis/packet-dscrsp.c
+++ b/plugins/docsis/packet-dscrsp.c
@@ -31,7 +31,6 @@
 
 /* Initialize the protocol and registered fields */
 static int proto_docsis_dscrsp = -1;
-static int hf_docsis_dscrsp = -1;
 static int hf_docsis_dscrsp_tranid = -1;
 static int hf_docsis_dscrsp_response = -1;
 static dissector_handle_t docsis_tlv_handle;
@@ -94,11 +93,6 @@ proto_register_docsis_dscrsp (void)
 
 /* Setup list of header fields  See Section 1.6.1 for details*/
   static hf_register_info hf[] = {
-    {&hf_docsis_dscrsp,
-     {"Dynamic Service Change Request", "docsis_dscrsp",
-      FT_BYTES, BASE_NONE, NULL, 0x0,
-      "Dynamic Service Add Request", HFILL}
-     },
     {&hf_docsis_dscrsp_tranid,
      {"Transaction Id", "docsis_dscrsp.tranid",
       FT_UINT16, BASE_DEC, NULL, 0x0,
diff --git a/plugins/docsis/packet-dsdreq.c b/plugins/docsis/packet-dsdreq.c
index 44ddf64e36..2236051dad 100644
--- a/plugins/docsis/packet-dsdreq.c
+++ b/plugins/docsis/packet-dsdreq.c
@@ -31,7 +31,6 @@
 
 /* Initialize the protocol and registered fields */
 static int proto_docsis_dsdreq = -1;
-static int hf_docsis_dsdreq = -1;
 static int hf_docsis_dsdreq_tranid = -1;
 static int hf_docsis_dsdreq_rsvd = -1;
 static int hf_docsis_dsdreq_sfid = -1;
@@ -92,11 +91,6 @@ proto_register_docsis_dsdreq (void)
 
 /* Setup list of header fields  See Section 1.6.1 for details*/
   static hf_register_info hf[] = {
-    {&hf_docsis_dsdreq,
-     {"Dynamic Service Delete Request", "docsis_dsdreq",
-      FT_BYTES, BASE_NONE, NULL, 0x0,
-      NULL, HFILL}
-     },
     {&hf_docsis_dsdreq_tranid,
      {"Transaction Id", "docsis_dsdreq.tranid",
       FT_UINT16, BASE_DEC, NULL, 0x0,
diff --git a/plugins/docsis/packet-dsdrsp.c b/plugins/docsis/packet-dsdrsp.c
index e52efcdae4..016070969f 100644
--- a/plugins/docsis/packet-dsdrsp.c
+++ b/plugins/docsis/packet-dsdrsp.c
@@ -31,7 +31,6 @@
 
 /* Initialize the protocol and registered fields */
 static int proto_docsis_dsdrsp = -1;
-static int hf_docsis_dsdrsp = -1;
 static int hf_docsis_dsdrsp_tranid = -1;
 static int hf_docsis_dsdrsp_confcode = -1;
 static int hf_docsis_dsdrsp_rsvd = -1;
@@ -90,11 +89,6 @@ proto_register_docsis_dsdrsp (void)
 
 /* Setup list of header fields  See Section 1.6.1 for details*/
   static hf_register_info hf[] = {
-    {&hf_docsis_dsdrsp,
-     {"Dynamic Service Delete Response", "docsis_dsdrsp",
-      FT_BYTES, BASE_NONE, NULL, 0x0,
-      NULL, HFILL}
-     },
     {&hf_docsis_dsdrsp_tranid,
      {"Transaction Id", "docsis_dsdrsp.tranid",
       FT_UINT16, BASE_DEC, NULL, 0x0,
diff --git a/plugins/docsis/packet-intrngreq.c b/plugins/docsis/packet-intrngreq.c
index 4743b5251a..5f2d89b480 100644
--- a/plugins/docsis/packet-intrngreq.c
+++ b/plugins/docsis/packet-intrngreq.c
@@ -32,7 +32,6 @@
 
 /* Initialize the protocol and registered fields */
 static int proto_docsis_intrngreq = -1;
-static int hf_docsis_intrngreq = -1;
 static int hf_docsis_intrngreq_down_chid = -1;
 static int hf_docsis_intrngreq_sid = -1;
 static int hf_docsis_intrngreq_up_chid = -1;
@@ -88,11 +87,6 @@ proto_register_docsis_intrngreq (void)
 
 /* Setup list of header fields  See Section 1.6.1 for details*/
   static hf_register_info hf[] = {
-    {&hf_docsis_intrngreq,
-     {"RNG-REQ Message", "docsis_intrngreq",
-      FT_BYTES, BASE_NONE, NULL, 0x0,
-      "Ranging Request Message", HFILL}
-     },
     {&hf_docsis_intrngreq_sid,
      {"Service Identifier", "docsis_intrngreq.sid",
       FT_UINT16, BASE_DEC, NULL, 0x0,
diff --git a/plugins/docsis/packet-macmgmt.c b/plugins/docsis/packet-macmgmt.c
index e4c64650d6..f4e9c814cb 100644
--- a/plugins/docsis/packet-macmgmt.c
+++ b/plugins/docsis/packet-macmgmt.c
@@ -64,7 +64,6 @@
 
 /* Initialize the protocol and registered fields */
 static int proto_docsis_mgmt = -1;
-static int hf_docsis_mgt_hdr = -1;
 static int hf_docsis_mgt_dst_addr = -1;
 static int hf_docsis_mgt_src_addr = -1;
 static int hf_docsis_mgt_msg_len = -1;
@@ -196,11 +195,6 @@ proto_register_docsis_mgmt (void)
 
 /* Setup list of header fields  See Section 1.6.1 for details*/
   static hf_register_info hf[] = {
-    {&hf_docsis_mgt_hdr,
-     {"Mac Management Header", "docsis_mgmt",
-      FT_BYTES, BASE_NONE, NULL, 0x0,
-      NULL, HFILL}
-     },
     {&hf_docsis_mgt_dst_addr,
      {"Destination Address", "docsis_mgmt.dst",
       FT_ETHER, BASE_NONE, NULL, 0x0,
diff --git a/plugins/docsis/packet-map.c b/plugins/docsis/packet-map.c
index 8b33d72736..18d4513973 100644
--- a/plugins/docsis/packet-map.c
+++ b/plugins/docsis/packet-map.c
@@ -48,7 +48,6 @@ static int proto_docsis_map = -1;
 static int hf_docsis_map_upstream_chid = -1;
 static int hf_docsis_map_ucd_count = -1;
 static int hf_docsis_map_numie = -1;
-static int hf_docsis_map = -1;
 static int hf_docsis_map_alloc_start = -1;
 static int hf_docsis_map_ack_time = -1;
 static int hf_docsis_map_rng_start = -1;
@@ -176,11 +175,6 @@ proto_register_docsis_map (void)
 
 /* Setup list of header fields  See Section 1.6.1 for details*/
   static hf_register_info hf[] = {
-    {&hf_docsis_map,
-     {"Map Message", "docsis_map",
-      FT_BYTES, BASE_NONE, NULL, 0x0,
-      NULL, HFILL}
-     },
     {&hf_docsis_map_ucd_count,
      {"UCD Count", "docsis_map.ucdcount",
       FT_UINT8, BASE_DEC, NULL, 0x0,
diff --git a/plugins/docsis/packet-mdd.c b/plugins/docsis/packet-mdd.c
index 963910e2a2..a4e70043ed 100644
--- a/plugins/docsis/packet-mdd.c
+++ b/plugins/docsis/packet-mdd.c
@@ -237,7 +237,6 @@ static const value_string upstream_transmit_power_reporting_vals[] = {
 
 /* Initialize the protocol and registered fields */
 static int proto_docsis_mdd = -1;
-static int hf_docsis_mdd = -1;
 static int hf_docsis_mdd_ccc = -1;
 static int hf_docsis_mdd_number_of_fragments = -1;
 static int hf_docsis_mdd_fragment_sequence_number = -1;
@@ -541,11 +540,6 @@ void proto_register_docsis_mdd (void)
 {
 	/* Setup list of header fields  See Section 1.6.1 for details*/
 	static hf_register_info hf[] = {
-		{&hf_docsis_mdd,
-		{"Map Message", "docsis_mdd",
-		FT_BYTES, BASE_NONE, NULL, 0x0,
-		NULL, HFILL}
-		},
 		{&hf_docsis_mdd_ccc,
 		{"Configuration Change Count", "docsis_mdd.ccc",
 		FT_UINT8, BASE_DEC, NULL, 0x0,
diff --git a/plugins/docsis/packet-regack.c b/plugins/docsis/packet-regack.c
index 31f5276dc5..1cdfdf36d4 100644
--- a/plugins/docsis/packet-regack.c
+++ b/plugins/docsis/packet-regack.c
@@ -31,7 +31,6 @@
 
 /* Initialize the protocol and registered fields */
 static int proto_docsis_regack = -1;
-static int hf_docsis_regack = -1;
 static int hf_docsis_regack_sid = -1;
 static int hf_docsis_regack_response = -1;
 static dissector_handle_t docsis_tlv_handle;
@@ -93,11 +92,6 @@ proto_register_docsis_regack (void)
 
 /* Setup list of header fields  See Section 1.6.1 for details*/
   static hf_register_info hf[] = {
-    {&hf_docsis_regack,
-     {"Registration Request", "docsis_regack",
-      FT_BYTES, BASE_NONE, NULL, 0x0,
-      NULL, HFILL}
-     },
     {&hf_docsis_regack_sid,
      {"Service Identifier", "docsis_regack.sid",
       FT_UINT16, BASE_DEC, NULL, 0x0,
diff --git a/plugins/docsis/packet-regreq.c b/plugins/docsis/packet-regreq.c
index f84fc37d4d..d80743eca4 100644
--- a/plugins/docsis/packet-regreq.c
+++ b/plugins/docsis/packet-regreq.c
@@ -31,7 +31,6 @@
 
 /* Initialize the protocol and registered fields */
 static int proto_docsis_regreq = -1;
-static int hf_docsis_regreq = -1;
 static int hf_docsis_regreq_sid = -1;
 
 
@@ -89,11 +88,6 @@ proto_register_docsis_regreq (void)
 
 /* Setup list of header fields  See Section 1.6.1 for details*/
   static hf_register_info hf[] = {
-    {&hf_docsis_regreq,
-     {"Registration Request", "docsis_regreq",
-      FT_BYTES, BASE_NONE, NULL, 0x0,
-      NULL, HFILL}
-     },
     {&hf_docsis_regreq_sid,
      {"Service Identifier", "docsis_regreq.sid",
       FT_UINT16, BASE_DEC, NULL, 0x0,
diff --git a/plugins/docsis/packet-regreqmp.c b/plugins/docsis/packet-regreqmp.c
index 668e63dbbd..bf4021e326 100644
--- a/plugins/docsis/packet-regreqmp.c
+++ b/plugins/docsis/packet-regreqmp.c
@@ -33,7 +33,6 @@
 
 /* Initialize the protocol and registered fields */
 static int proto_docsis_regreqmp = -1;
-static int hf_docsis_regreqmp = -1;
 
 static int hf_docsis_regreqmp_sid = -1;
 
@@ -87,11 +86,6 @@ proto_register_docsis_regreqmp (void)
 {
 	/* Setup list of header fields  See Section 1.6.1 for details*/
 	static hf_register_info hf[] = {
-		{&hf_docsis_regreqmp,
-		{"REG-REQ-MP Message", "docsis_regreqmp",
-		FT_BYTES, BASE_NONE, NULL, 0x0,
-		NULL, HFILL}
-		},
 		{&hf_docsis_regreqmp_sid,
 		{"Sid", "docsis_regreqmp.sid",
 		FT_UINT16, BASE_DEC, NULL, 0x0,
diff --git a/plugins/docsis/packet-regrsp.c b/plugins/docsis/packet-regrsp.c
index e857aadc73..19c550aefe 100644
--- a/plugins/docsis/packet-regrsp.c
+++ b/plugins/docsis/packet-regrsp.c
@@ -31,7 +31,6 @@
 
 /* Initialize the protocol and registered fields */
 static int proto_docsis_regrsp = -1;
-static int hf_docsis_regrsp = -1;
 static int hf_docsis_regrsp_sid = -1;
 static int hf_docsis_regrsp_response = -1;
 static dissector_handle_t docsis_tlv_handle;
@@ -91,11 +90,6 @@ proto_register_docsis_regrsp (void)
 
 /* Setup list of header fields  See Section 1.6.1 for details*/
   static hf_register_info hf[] = {
-    {&hf_docsis_regrsp,
-     {"Registration Response", "docsis_regrsp",
-      FT_BYTES, BASE_NONE, NULL, 0x0,
-      "Registration Request", HFILL}
-     },
     {&hf_docsis_regrsp_sid,
      {"Service Identifier", "docsis_regrsp.sid",
       FT_UINT16, BASE_DEC, NULL, 0x0,
diff --git a/plugins/docsis/packet-regrspmp.c b/plugins/docsis/packet-regrspmp.c
index 5c976d9b06..a8a857c1af 100644
--- a/plugins/docsis/packet-regrspmp.c
+++ b/plugins/docsis/packet-regrspmp.c
@@ -34,7 +34,6 @@
 
 /* Initialize the protocol and registered fields */
 static int proto_docsis_regrspmp = -1;
-static int hf_docsis_regrspmp = -1;
 
 static int hf_docsis_regrspmp_sid = -1;
 
@@ -94,11 +93,6 @@ proto_register_docsis_regrspmp (void)
 
 	/* Setup list of header fields  See Section 1.6.1 for details*/
 	static hf_register_info hf[] = {
-		{&hf_docsis_regrspmp,
-		{"REG-RSP-MP Message", "docsis_regrspmp",
-		FT_BYTES, BASE_NONE, NULL, 0x0,
-		NULL, HFILL}
-		},
 		{&hf_docsis_regrspmp_sid,
 		{"Sid", "docsis_regrspmp.sid",
 		FT_UINT16, BASE_DEC, NULL, 0x0,
diff --git a/plugins/docsis/packet-rngreq.c b/plugins/docsis/packet-rngreq.c
index ad5ed59d47..985734bc51 100644
--- a/plugins/docsis/packet-rngreq.c
+++ b/plugins/docsis/packet-rngreq.c
@@ -32,7 +32,6 @@
 
 /* Initialize the protocol and registered fields */
 static int proto_docsis_rngreq = -1;
-static int hf_docsis_rngreq = -1;
 static int hf_docsis_rngreq_down_chid = -1;
 static int hf_docsis_rngreq_sid = -1;
 static int hf_docsis_rngreq_pend_compl = -1;
@@ -91,11 +90,6 @@ proto_register_docsis_rngreq (void)
 
 /* Setup list of header fields  See Section 1.6.1 for details*/
   static hf_register_info hf[] = {
-    {&hf_docsis_rngreq,
-     {"RNG-REQ Message", "docsis_rngreq",
-      FT_BYTES, BASE_NONE, NULL, 0x0,
-      "Ranging Request Message", HFILL}
-     },
     {&hf_docsis_rngreq_sid,
      {"Service Identifier", "docsis_rngreq.sid",
       FT_UINT16, BASE_DEC, NULL, 0x0,
diff --git a/plugins/docsis/packet-rngrsp.c b/plugins/docsis/packet-rngrsp.c
index 11553d11b1..f2cb2c197c 100644
--- a/plugins/docsis/packet-rngrsp.c
+++ b/plugins/docsis/packet-rngrsp.c
@@ -39,7 +39,6 @@
 
 /* Initialize the protocol and registered fields */
 static int proto_docsis_rngrsp = -1;
-static int hf_docsis_rngrsp = -1;
 static int hf_docsis_rngrsp_upstream_chid = -1;
 static int hf_docsis_rngrsp_sid = -1;
 static int hf_docsis_rngrsp_timing_adj = -1;
@@ -199,11 +198,6 @@ proto_register_docsis_rngrsp (void)
 
 /* Setup list of header fields  See Section 1.6.1 for details*/
   static hf_register_info hf[] = {
-    {&hf_docsis_rngrsp,
-     {"RNG-RSP Message", "docsis_rngrsp",
-      FT_BYTES, BASE_NONE, NULL, 0x0,
-      "Ranging Response Message", HFILL}
-     },
     {&hf_docsis_rngrsp_sid,
      {"Service Identifier", "docsis_rngrsp.sid",
       FT_UINT16, BASE_DEC, NULL, 0x0,
diff --git a/plugins/docsis/packet-sync.c b/plugins/docsis/packet-sync.c
index a0bfc316c5..94e42a31ee 100644
--- a/plugins/docsis/packet-sync.c
+++ b/plugins/docsis/packet-sync.c
@@ -32,7 +32,6 @@
 
 /* Initialize the protocol and registered fields */
 static int proto_docsis_sync = -1;
-static int hf_docsis_sync = -1;
 static int hf_docsis_sync_cmts_timestamp = -1;
 
 
@@ -72,11 +71,6 @@ proto_register_docsis_sync (void)
 {
 	/* Setup list of header fields  See Section 1.6.1 for details*/
 	static hf_register_info hf[] = {
-		{&hf_docsis_sync,
-		{"SYNC Message", "docsis_sync",
-		FT_BYTES, BASE_NONE, NULL, 0x0,
-		NULL, HFILL}
-		},
 		{&hf_docsis_sync_cmts_timestamp,
 		{"CMTS Timestamp", "docsis_sync.cmts_timestamp",
 		FT_UINT32, BASE_DEC, NULL, 0x0,
diff --git a/plugins/docsis/packet-tlv.c b/plugins/docsis/packet-tlv.c
index e7e16a9c0a..c73e37c917 100644
--- a/plugins/docsis/packet-tlv.c
+++ b/plugins/docsis/packet-tlv.c
@@ -42,7 +42,6 @@ static dissector_handle_t docsis_vsif_handle;
 
 
 static int proto_docsis_tlv = -1;
-static int hf_docsis_tlv = -1;
 static int hf_docsis_tlv_down_freq = -1;
 static int hf_docsis_tlv_upstream_chid = -1;
 static int hf_docsis_tlv_net_access = -1;
@@ -2091,11 +2090,6 @@ proto_register_docsis_tlv (void)
 
 /* Setup list of header fields  See Section 1.6.1 for details*/
   static hf_register_info hf[] = {
-    {&hf_docsis_tlv,
-     {"TLV Data", "docsis_tlv",
-      FT_BYTES, BASE_NONE, NULL, 0x0,
-      NULL, HFILL}
-     },
     {&hf_docsis_tlv_down_freq,
      {"1 Downstream Frequency", "docsis_tlv.downfreq",
       FT_UINT32, BASE_DEC, NULL, 0x0,
diff --git a/plugins/docsis/packet-uccreq.c b/plugins/docsis/packet-uccreq.c
index e3b697936e..f9b80da9e9 100644
--- a/plugins/docsis/packet-uccreq.c
+++ b/plugins/docsis/packet-uccreq.c
@@ -31,7 +31,6 @@
 
 /* Initialize the protocol and registered fields */
 static int proto_docsis_uccreq = -1;
-static int hf_docsis_uccreq = -1;
 static int hf_docsis_uccreq_upchid = -1;
 static dissector_handle_t docsis_tlv_handle;
 
@@ -89,11 +88,6 @@ proto_register_docsis_uccreq (void)
 
 /* Setup list of header fields  See Section 1.6.1 for details*/
   static hf_register_info hf[] = {
-    {&hf_docsis_uccreq,
-     {"Upstream Channel Change Request", "docsis_uccreq",
-      FT_BYTES, BASE_NONE, NULL, 0x0,
-      NULL, HFILL}
-     },
     {&hf_docsis_uccreq_upchid,
      {"Upstream Channel Id", "docsis_uccreq.upchid",
       FT_UINT8, BASE_DEC, NULL, 0x0,
diff --git a/plugins/docsis/packet-uccrsp.c b/plugins/docsis/packet-uccrsp.c
index ce411ec8b2..8f07607ba1 100644
--- a/plugins/docsis/packet-uccrsp.c
+++ b/plugins/docsis/packet-uccrsp.c
@@ -31,7 +31,6 @@
 
 /* Initialize the protocol and registered fields */
 static int proto_docsis_uccrsp = -1;
-static int hf_docsis_uccrsp = -1;
 static int hf_docsis_uccrsp_upchid = -1;
 
 
@@ -82,11 +81,6 @@ proto_register_docsis_uccrsp (void)
 
 /* Setup list of header fields  See Section 1.6.1 for details*/
   static hf_register_info hf[] = {
-    {&hf_docsis_uccrsp,
-     {"Upstream Channel Change Request", "docsis_uccrsp",
-      FT_BYTES, BASE_NONE, NULL, 0x0,
-      NULL, HFILL}
-     },
     {&hf_docsis_uccrsp_upchid,
      {"Upstream Channel Id", "docsis_uccrsp.upchid",
       FT_UINT8, BASE_DEC, NULL, 0x0,
diff --git a/plugins/docsis/packet-vendor.c b/plugins/docsis/packet-vendor.c
index a1b914d600..9b1623074f 100644
--- a/plugins/docsis/packet-vendor.c
+++ b/plugins/docsis/packet-vendor.c
@@ -60,7 +60,6 @@
 
 /* Initialize the protocol and registered fields */
 static int proto_docsis_vsif = -1;
-static int hf_docsis_vsif = -1;
 static int hf_docsis_vsif_vendorid = -1;
 static int hf_docsis_vsif_vendor_unknown = -1;
 static int hf_docsis_vsif_cisco_numphones = -1;
@@ -229,11 +228,6 @@ proto_register_docsis_vsif (void)
 
 /* Setup list of header fields  See Section 1.6.1 for details*/
   static hf_register_info hf[] = {
-    {&hf_docsis_vsif,
-     {"VSIF Encodings", "docsis_vsif",
-      FT_BYTES, BASE_NONE, NULL, 0x0,
-      "Vendor Specific Encodings", HFILL}
-     },
     {&hf_docsis_vsif_vendorid,
      {"Vendor Id", "docsis_vsif.vendorid",
       FT_UINT24, BASE_HEX, VALS(vendorid_vals), 0x0,