From Florian Fainelli via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8148 :

Fix dissection of HomePlug AV 1.1 frames with fragmentation information

From me: indentation fixes

svn path=/trunk/; revision=46871

1 files changed, 322 insertions, 310 deletions

diff --git a/epan/dissectors/packet-homeplug-av.c b/epan/dissectors/packet-homeplug-av.c
index 851fea066b..a8c9af7c85 100644
--- a/epan/dissectors/packet-homeplug-av.c
+++ b/epan/dissectors/packet-homeplug-av.c
@@ -1104,11 +1104,13 @@ dissect_homeplug_av_mmhdr(ptvcursor_t *cursor)
    proto_tree *ti_mmtype;
    proto_tree *ti_vendor;
    proto_tree *ti_public;
-   guint8 lsb, msb;
+   guint8 lsb, msb, mmv;
    guint16 homeplug_av_mmtype;
 
    ti = ptvcursor_add_no_advance(cursor, hf_homeplug_av_mmhdr, 3, ENC_NA);
 
+   mmv = tvb_get_guint8(ptvcursor_tvbuff(cursor),
+                        ptvcursor_current_offset(cursor));
    lsb = tvb_get_guint8(ptvcursor_tvbuff(cursor),
                         ptvcursor_current_offset(cursor) + 1);
    msb = tvb_get_guint8(ptvcursor_tvbuff(cursor),
@@ -1128,11 +1130,20 @@ dissect_homeplug_av_mmhdr(ptvcursor_t *cursor)
       {
          ptvcursor_add(cursor, hf_homeplug_av_mmhdr_mmtype_lsb, 1, ENC_BIG_ENDIAN);
          ptvcursor_add(cursor, hf_homeplug_av_mmhdr_mmtype_msb, 1, ENC_BIG_ENDIAN);
+
+         /* Fragmentation information is part of the header in HomePlug AV 1.1 */
+         if (mmv)
+         {
+            ptvcursor_add_no_advance(cursor, hf_homeplug_av_public_frag_count, 1, ENC_BIG_ENDIAN);
+            ptvcursor_add(cursor, hf_homeplug_av_public_frag_index, 1, ENC_BIG_ENDIAN);
+            ptvcursor_add(cursor, hf_homeplug_av_public_frag_seqnum, 1, ENC_BIG_ENDIAN);
+         }
       }
       ptvcursor_pop_subtree(cursor);
    }
    ptvcursor_pop_subtree(cursor);
 
+   /* Vendor management frame */
    if (homeplug_av_mmtype_msb_is_vendor(msb))
    {
       ti_vendor = ptvcursor_add_no_advance(cursor, hf_homeplug_av_vendor, -1, ENC_NA);
@@ -1143,7 +1154,8 @@ dissect_homeplug_av_mmhdr(ptvcursor_t *cursor)
       }
       ptvcursor_pop_subtree(cursor);
    }
-   else
+   /* Public management frame in HomePlug AV 1.0 */
+   else if (!mmv)
    {
       ti_public = ptvcursor_add_no_advance(cursor, hf_homeplug_av_public, -1, ENC_NA);
 
@@ -1354,7 +1366,7 @@ dissect_homeplug_av_cc_disc_list_cnf(ptvcursor_t *cursor)
       }
 
       num_nets = tvb_get_guint8(ptvcursor_tvbuff(cursor),
-				ptvcursor_current_offset(cursor));
+                                ptvcursor_current_offset(cursor));
       ptvcursor_add(cursor, hf_homeplug_av_cc_disc_list_net_cnt, 1, ENC_BIG_ENDIAN);
 
       for (net = 0; net < num_nets; net++) {
@@ -1483,7 +1495,7 @@ dissect_homeplug_av_cm_get_key_req(ptvcursor_t *cursor)
 
       ptvcursor_add(cursor, hf_homeplug_av_cm_get_key_req_type, 1, ENC_BIG_ENDIAN);
       key_type = tvb_get_guint8(ptvcursor_tvbuff(cursor),
-				ptvcursor_current_offset(cursor));
+                                ptvcursor_current_offset(cursor));
       ptvcursor_add(cursor, hf_homeplug_av_nw_info_key_type, 1, ENC_BIG_ENDIAN);
       ptvcursor_add(cursor, hf_homeplug_av_nw_info_nid, 7, ENC_NA);
       ptvcursor_add(cursor, hf_homeplug_av_nw_info_my_nonce, 4, ENC_LITTLE_ENDIAN);
@@ -2657,7 +2669,7 @@ dissect_homeplug_av_tone_map_cnf(ptvcursor_t *cursor)
       ptvcursor_add(cursor, hf_homeplug_av_tone_map_cnf_slot, 1, ENC_BIG_ENDIAN);
       ptvcursor_add(cursor, hf_homeplug_av_tone_map_cnf_num_tms, 1, ENC_BIG_ENDIAN);
       num_act_carriers = tvb_get_letohs(ptvcursor_tvbuff(cursor),
-				ptvcursor_current_offset(cursor));
+                                        ptvcursor_current_offset(cursor));
       ptvcursor_add(cursor, hf_homeplug_av_tone_map_cnf_num_act, 2, ENC_LITTLE_ENDIAN);
 
       if (num_act_carriers) {
@@ -2665,7 +2677,7 @@ dissect_homeplug_av_tone_map_cnf(ptvcursor_t *cursor)
 
           /* check if number of carriers is odd */
          if (num_act_carriers & 1)
- 	    max_carriers += 1;
+            max_carriers += 1;
 
          for (i = 0; i < max_carriers; i++) {
             dissect_homeplug_av_tone_map_carrier(cursor);
@@ -2889,929 +2901,929 @@ proto_register_homeplug_av(void)
    static hf_register_info hf[] = {
       { &hf_homeplug_av_reserved,
         { "Reserved", "homeplug_av.reserved",
-	  FT_NONE, BASE_NONE, NULL, 0x00, NULL, HFILL }
+          FT_NONE, BASE_NONE, NULL, 0x00, NULL, HFILL }
       },
       /* MM Header */
       { &hf_homeplug_av_mmhdr,
         { "MAC Management Header", "homeplug_av.mmhdr",
-	  FT_NONE, BASE_NONE, NULL, 0x00, NULL, HFILL }
+          FT_NONE, BASE_NONE, NULL, 0x00, NULL, HFILL }
       },
       { &hf_homeplug_av_mmhdr_mmver,
         { "Version", "homeplug_av.mmhdr.mmver",
-	  FT_UINT8, BASE_DEC, VALS(homeplug_av_mmver_vals), HOMEPLUG_AV_MMVER_MASK, NULL, HFILL }
+          FT_UINT8, BASE_DEC, VALS(homeplug_av_mmver_vals), HOMEPLUG_AV_MMVER_MASK, NULL, HFILL }
       },
       { &hf_homeplug_av_mmhdr_mmtype,
         { "Type", "homeplug_av.mmhdr.mmtype",
-	  FT_UINT16, BASE_HEX | BASE_EXT_STRING, &homeplug_av_mmtype_vals_ext, 0x0000, NULL, HFILL }
+          FT_UINT16, BASE_HEX | BASE_EXT_STRING, &homeplug_av_mmtype_vals_ext, 0x0000, NULL, HFILL }
       },
       { &hf_homeplug_av_mmhdr_mmtype_lsb,
         { "LSB", "homeplug_av.mmhdr.mmtype.lsb",
-	  FT_UINT8, BASE_HEX, VALS(homeplug_av_mmtype_lsb_vals), HOMEPLUG_AV_MMTYPE_LSB_MASK, NULL, HFILL }
+          FT_UINT8, BASE_HEX, VALS(homeplug_av_mmtype_lsb_vals), HOMEPLUG_AV_MMTYPE_LSB_MASK, NULL, HFILL }
       },
       { &hf_homeplug_av_mmhdr_mmtype_msb,
         { "MSB", "homeplug_av.mmhdr.mmtype.msb",
-	  FT_UINT8, BASE_HEX, VALS(homeplug_av_mmtype_msb_vals), HOMEPLUG_AV_MMTYPE_MSB_MASK, "Reserved", HFILL },
+          FT_UINT8, BASE_HEX, VALS(homeplug_av_mmtype_msb_vals), HOMEPLUG_AV_MMTYPE_MSB_MASK, "Reserved", HFILL },
       },
       /* Public MME */
       { &hf_homeplug_av_public,
         { "Public MME", "homeplug_av.public",
-	  FT_NONE, BASE_NONE, NULL, 0x00, NULL, HFILL }
+          FT_NONE, BASE_NONE, NULL, 0x00, NULL, HFILL }
       },
       { &hf_homeplug_av_public_frag_count,
         { "Fragment count", "homeplug_av.public.frag_count",
-	  FT_UINT8, BASE_DEC, NULL, HOMEPLUG_AV_PUBLIC_FRAG_COUNT_MASK, NULL, HFILL }
+          FT_UINT8, BASE_DEC, NULL, HOMEPLUG_AV_PUBLIC_FRAG_COUNT_MASK, NULL, HFILL }
       },
       { &hf_homeplug_av_public_frag_index,
         { "Fragment index", "homeplug_av.public.frag_index",
-	  FT_UINT8, BASE_DEC, NULL, HOMEPLUG_AV_PUBLIC_FRAG_INDEX_MASK, NULL, HFILL }
+          FT_UINT8, BASE_DEC, NULL, HOMEPLUG_AV_PUBLIC_FRAG_INDEX_MASK, NULL, HFILL }
       },
       { &hf_homeplug_av_public_frag_seqnum,
         { "Fragment Sequence number", "homeplug_av.public.frag_seqnum",
-	  FT_UINT8, BASE_DEC, NULL, 0x00, NULL, HFILL }
+          FT_UINT8, BASE_DEC, NULL, 0x00, NULL, HFILL }
       },
       /* Frame Control */
       { &hf_homeplug_av_fc,
         { "Frame control", "homeplug_av.fc",
-	  FT_NONE, BASE_NONE, NULL, 0x00, NULL, HFILL }
+          FT_NONE, BASE_NONE, NULL, 0x00, NULL, HFILL }
       },
       { &hf_homeplug_av_fc_stei,
         { "Source Terminal Equipment Identifier", "homeplug_av.fc.snei",
-	  FT_UINT8, BASE_DEC, NULL, 0x00, NULL, HFILL }
+          FT_UINT8, BASE_DEC, NULL, 0x00, NULL, HFILL }
       },
       { &hf_homeplug_av_fc_dtei,
         { "Destination Terminal Equipment Identifier", "homeplug_av.fc.dtei",
-	  FT_UINT8, BASE_DEC, NULL, 0x00, NULL, HFILL }
+          FT_UINT8, BASE_DEC, NULL, 0x00, NULL, HFILL }
       },
       { &hf_homeplug_av_fc_lid,
         { "Link ID", "homeplug_av.fc.lid",
-	  FT_UINT8, BASE_DEC, NULL, 0x00, NULL, HFILL }
+          FT_UINT8, BASE_DEC, NULL, 0x00, NULL, HFILL }
       },
       { &hf_homeplug_av_fc_cfs,
         { "Contention free session", "homeplug_av.fc.cfs",
-	  FT_BOOLEAN, 8, NULL, 0x01, NULL, HFILL }
+          FT_BOOLEAN, 8, NULL, 0x01, NULL, HFILL }
       },
       { &hf_homeplug_av_fc_bdf,
         { "Beacon detect flag", "homeplug_av.fc.bdf",
-	  FT_BOOLEAN, 8, NULL, 0x02, NULL, HFILL }
+          FT_BOOLEAN, 8, NULL, 0x02, NULL, HFILL }
       },
       { &hf_homeplug_av_fc_hp10df,
         { "Homeplug AV version 1.0", "homeplug_av.fc.hp10df",
-	  FT_BOOLEAN, 8, NULL, 0x04, NULL, HFILL }
+          FT_BOOLEAN, 8, NULL, 0x04, NULL, HFILL }
       },
       { &hf_homeplug_av_fc_hp11df,
         { "Homeplug AV version 1.1", "homeplug_av.fc.hp11df",
-	  FT_BOOLEAN, 8, NULL, 0x08, NULL, HFILL }
+          FT_BOOLEAN, 8, NULL, 0x08, NULL, HFILL }
       },
       { &hf_homeplug_av_fc_ppb,
         { "Pending PHY blocks", "homeplug_av.fc.ppb",
-	  FT_UINT8, BASE_DEC, NULL, 0x00, NULL, HFILL }
+          FT_UINT8, BASE_DEC, NULL, 0x00, NULL, HFILL }
       },
       { &hf_homeplug_av_fc_ble,
         { "Bit loading estimate", "homeplug_av.fc.ble",
-	  FT_UINT8, BASE_DEC, NULL, 0x00, NULL, HFILL }
+          FT_UINT8, BASE_DEC, NULL, 0x00, NULL, HFILL }
       },
       { &hf_homeplug_av_fc_pbsz,
         { "PHY block size", "homeplug_av.fc.pbsz",
-	  FT_BOOLEAN, 8, NULL, 0x01, NULL, HFILL }
+          FT_BOOLEAN, 8, NULL, 0x01, NULL, HFILL }
       },
       { &hf_homeplug_av_fc_num_sym,
         { "Number of symbols", "homeplug_av.fc.num_sym",
-	  FT_UINT8, BASE_DEC, NULL, 0x06, NULL, HFILL }
+          FT_UINT8, BASE_DEC, NULL, 0x06, NULL, HFILL }
       },
       { &hf_homeplug_av_fc_tmi_av,
         { "Tonemap index", "homeplug_av.fc.tmi_av",
-	  FT_UINT8, BASE_DEC, NULL, 0xF8, NULL, HFILL }
+          FT_UINT8, BASE_DEC, NULL, 0xF8, NULL, HFILL }
       },
       { &hf_homeplug_av_fc_fl_av,
         { "Frame length", "homeplug_av.fc.fl_av",
-	  FT_UINT16, BASE_DEC, NULL, 0x0FFF, NULL, HFILL }
+          FT_UINT16, BASE_DEC, NULL, 0x0FFF, NULL, HFILL }
       },
       { &hf_homeplug_av_fc_mpdu_cnt,
         { "MPDU count", "homeplug_av.fc.mpdu_cnt",
-	  FT_UINT8, BASE_DEC, NULL, 0x3000, NULL, HFILL }
+          FT_UINT8, BASE_DEC, NULL, 0x3000, NULL, HFILL }
       },
       { &hf_homeplug_av_fc_burst_cnt,
         { "Burst count", "homeplug_av.fc.burst_cnt",
-	  FT_UINT8, BASE_DEC, NULL, 0xC000, NULL, HFILL }
+          FT_UINT8, BASE_DEC, NULL, 0xC000, NULL, HFILL }
       },
       { &hf_homeplug_av_fc_clst,
         { "Convergence layer SAP type", "homeplug_av.fc.clst",
-	  FT_UINT8, BASE_HEX, NULL, 0x07, NULL, HFILL }
+          FT_UINT8, BASE_HEX, NULL, 0x07, NULL, HFILL }
       },
       { &hf_homeplug_av_fc_rg_len,
         { "Reverse grant length", "homeplug_av.fc.rg_len",
-	  FT_UINT8, BASE_DEC, NULL, 0x3F, NULL, HFILL }
+          FT_UINT8, BASE_DEC, NULL, 0x3F, NULL, HFILL }
       },
       { &hf_homeplug_av_fc_mfs_cmd_mgmt,
         { "Management MAC frame stream command", "homeplug_av.fc.mfs_cmd_mgmt",
-	  FT_UINT8, BASE_DEC, NULL, 0x0E, NULL, HFILL }
+          FT_UINT8, BASE_DEC, NULL, 0x0E, NULL, HFILL }
       },
       { &hf_homeplug_av_fc_mfs_cmd_data,
         { "Data MAC frame stream command", "homeplug_av.fc.mfs_data_mgmt",
-	  FT_UINT8, BASE_DEC, NULL, 0x70, NULL, HFILL }
+          FT_UINT8, BASE_DEC, NULL, 0x70, NULL, HFILL }
       },
       { &hf_homeplug_av_fc_rsr,
         { "Request SACK transmission", "homeplug_av.fc.rsr",
-	  FT_BOOLEAN, 8, NULL, 0x80, NULL, HFILL }
+          FT_BOOLEAN, 8, NULL, 0x80, NULL, HFILL }
       },
       { &hf_homeplug_av_fc_mcf,
         { "Multicast", "homeplug_av.fc.mcf",
-	  FT_BOOLEAN, 8, NULL, 0x01, NULL, HFILL }
+          FT_BOOLEAN, 8, NULL, 0x01, NULL, HFILL }
       },
       { &hf_homeplug_av_fc_dccpcf,
         { "Different CP PHY clock", "homeplug_av.fc.dccpcf",
-	  FT_BOOLEAN, 8, NULL, 0x02, NULL, HFILL }
+          FT_BOOLEAN, 8, NULL, 0x02, NULL, HFILL }
       },
       { &hf_homeplug_av_fc_mnbf,
         { "Multinetwork broadcast", "homeplug_av.fc.mnbf",
-	  FT_BOOLEAN, 8, NULL, 0x04, NULL, HFILL }
+          FT_BOOLEAN, 8, NULL, 0x04, NULL, HFILL }
       },
       /* Beacon body */
       { &hf_homeplug_av_bcn,
         { "Beacon", "homeplug_av.bcn",
-	  FT_NONE, BASE_NONE, NULL, 0x00, NULL, HFILL }
+          FT_NONE, BASE_NONE, NULL, 0x00, NULL, HFILL }
       },
       { &hf_homeplug_av_bcn_bts,
         { "Beacon timestamp", "homeplug_av.bcn.bts",
-	  FT_UINT32, BASE_DEC, NULL, 0x00, NULL, HFILL }
+          FT_UINT32, BASE_DEC, NULL, 0x00, NULL, HFILL }
       },
       { &hf_homeplug_av_bcn_bto_0,
         { "Beacon transmission offset 0", "homeplug_av.bcn.bto_0",
-	  FT_UINT16, BASE_HEX, NULL, 0x00, NULL, HFILL }
+          FT_UINT16, BASE_HEX, NULL, 0x00, NULL, HFILL }
       },
       { &hf_homeplug_av_bcn_bto_1,
         { "Beacon transmission offset 1", "homeplug_av.bcn.bto_1",
-	  FT_UINT16, BASE_HEX, NULL, 0x00, NULL, HFILL }
+          FT_UINT16, BASE_HEX, NULL, 0x00, NULL, HFILL }
       },
       { &hf_homeplug_av_bcn_bto_2,
         { "Beacon transmission offset 2", "homeplug_av.bcn.bto_2",
-	  FT_UINT16, BASE_HEX, NULL, 0x00, NULL, HFILL }
+          FT_UINT16, BASE_HEX, NULL, 0x00, NULL, HFILL }
       },
       { &hf_homeplug_av_bcn_bto_3,
         { "Beacon transmission offset 3", "homeplug_av.bcn.bto_3",
-	  FT_UINT16, BASE_HEX, NULL, 0x00, NULL, HFILL }
+          FT_UINT16, BASE_HEX, NULL, 0x00, NULL, HFILL }
       },
       /* Central Coordination Discovery List Confirmation */
       { &hf_homeplug_av_cc_disc_list_cnf,
         { "Central Coordination Discovery List Confirmation", "homeplug_av.cc_disc_list_cnf",
-	  FT_NONE, BASE_NONE, NULL, 0x00, NULL, HFILL }
+          FT_NONE, BASE_NONE, NULL, 0x00, NULL, HFILL }
       },
       /* Station informations */
       { &hf_homeplug_av_cc_disc_list_sta_cnt,
         { "Station count", "homeplug_av.cc_disc_list_cnf.sta_cnt",
-	  FT_UINT8, BASE_DEC, NULL, 0x00, NULL, HFILL }
+          FT_UINT8, BASE_DEC, NULL, 0x00, NULL, HFILL }
       },
       { &hf_homeplug_av_cc_sta_info,
         { "Station information", "homeplug_av.cc_disc_list_cnf.sta_info",
-	  FT_NONE, BASE_NONE, NULL, 0x00, NULL, HFILL }
+          FT_NONE, BASE_NONE, NULL, 0x00, NULL, HFILL }
       },
       { &hf_homeplug_av_cc_sta_info_mac,
         { "MAC address", "homeplug_av.cc_disc_list_cnf.sta_info.mac",
-	  FT_ETHER, BASE_NONE, NULL, 0x00, NULL, HFILL }
+          FT_ETHER, BASE_NONE, NULL, 0x00, NULL, HFILL }
       },
       { &hf_homeplug_av_cc_sta_info_tei,
         { "Terminal Equipment Identifier", "homeplug_av.cc_disc_list_cnf.sta_info.tei",
-	  FT_UINT8, BASE_DEC, NULL, 0x00, NULL, HFILL }
+          FT_UINT8, BASE_DEC, NULL, 0x00, NULL, HFILL }
       },
       { &hf_homeplug_av_cc_sta_info_same_net,
         { "Network type", "homeplug_av.cc_disc_list_cnf.sta_info.same_net",
-	  FT_UINT8, BASE_HEX, VALS(homeplug_av_cc_sta_net_type_vals), HOMEPLUG_AV_CC_STA_NET_MASK, NULL, HFILL }
+          FT_UINT8, BASE_HEX, VALS(homeplug_av_cc_sta_net_type_vals), HOMEPLUG_AV_CC_STA_NET_MASK, NULL, HFILL }
       },
       { &hf_homeplug_av_cc_sta_info_sig_level,
         { "Signal level", "homeplug_av.cc_disc_list_cnf.sta_info.sig_level",
-	  FT_UINT8, BASE_HEX | BASE_EXT_STRING, &homeplug_av_sig_level_vals_ext, 0x00, "Reserved", HFILL }
+          FT_UINT8, BASE_HEX | BASE_EXT_STRING, &homeplug_av_sig_level_vals_ext, 0x00, "Reserved", HFILL }
       },
       { &hf_homeplug_av_cc_sta_info_avg_ble,
         { "Average BLE", "homeplug_av.cc_disc_list_cnf.sta_info.avg_ble",
-	  FT_UINT8, BASE_DEC, NULL, 0x00, NULL, HFILL }
+          FT_UINT8, BASE_DEC, NULL, 0x00, NULL, HFILL }
       },
       /* Network infos */
       { &hf_homeplug_av_cc_disc_list_net_cnt,
         { "Network count", "homeplug_av.cc_disc_list_cnf.net_cnt",
-	  FT_UINT8, BASE_DEC, NULL, 0x00, NULL, HFILL }
+          FT_UINT8, BASE_DEC, NULL, 0x00, NULL, HFILL }
       },
       { &hf_homeplug_av_cc_net_info,
         { "Network information", "homeplug_av.cc_disc_list_cnf.net_info",
-	  FT_NONE, BASE_NONE, NULL, 0x00, NULL, HFILL }
+          FT_NONE, BASE_NONE, NULL, 0x00, NULL, HFILL }
       },
       { &hf_homeplug_av_cc_net_info_hyb_mode,
         { "Hybrid mode", "homeplug_av.cc_disc_list_cnf.net_info.hyb_mode",
-	  FT_UINT8, BASE_HEX, NULL, 0x00, NULL, HFILL }
+          FT_UINT8, BASE_HEX, NULL, 0x00, NULL, HFILL }
       },
       { &hf_homeplug_av_cc_net_info_bcn_slots,
         { "Beacon slots", "homeplug_av.cc_disc_list_cnf.net_info.bcn_slots",
-	  FT_UINT8, BASE_DEC, NULL, 0x08, "Reserved", HFILL }
+          FT_UINT8, BASE_DEC, NULL, 0x08, "Reserved", HFILL }
       },
       { &hf_homeplug_av_cc_net_info_cco_sts,
         { "Coordinating status", "homeplug_av.cc_disc_list_cnf.net_info.cco_status",
-	  FT_UINT8, BASE_HEX, VALS(homeplug_av_cco_status_vals), HOMEPLUG_AV_CCO_STATUS_MASK, "Unknown", HFILL }
+          FT_UINT8, BASE_HEX, VALS(homeplug_av_cco_status_vals), HOMEPLUG_AV_CCO_STATUS_MASK, "Unknown", HFILL }
       },
       { &hf_homeplug_av_cc_net_info_bcn_ofs,
         { "Beacon offset", "homeplug_av.cc_disc_list_cnf.net_info.bcn_ofs",
-	  FT_UINT16, BASE_HEX, NULL, 0x00, NULL, HFILL }
+          FT_UINT16, BASE_HEX, NULL, 0x00, NULL, HFILL }
       },
       /* Shared encrypted related fields */
       { &hf_homeplug_av_nw_info_del_type,
         { "Delimiter type", "homeplug_av.nw_info.del_type",
-	  FT_UINT8, BASE_HEX, NULL, 0x07, NULL, HFILL }
+          FT_UINT8, BASE_HEX, NULL, 0x07, NULL, HFILL }
       },
       { &hf_homeplug_av_nw_info_fccs_av,
         { "Frame control check sequence", "homeplug_av.nw_info.fccs_av",
-	  FT_BYTES, BASE_NONE, NULL, 0x00, NULL, HFILL }
+          FT_BYTES, BASE_NONE, NULL, 0x00, NULL, HFILL }
       },
       { &hf_homeplug_av_nw_info_peks,
         { "Payload Encryption Key Select", "homeplug_av.nw_info.peks",
-	  FT_UINT8, BASE_HEX | BASE_EXT_STRING, &homeplug_av_peks_vals_ext, HOMEPLUG_AV_PEKS_MASK, NULL, HFILL }
+          FT_UINT8, BASE_HEX | BASE_EXT_STRING, &homeplug_av_peks_vals_ext, HOMEPLUG_AV_PEKS_MASK, NULL, HFILL }
       },
       { &hf_homeplug_av_nw_info_pid,
         { "Protocol ID", "homeplug_av.nw_info.pid",
-	  FT_UINT8, BASE_HEX, VALS(homeplug_av_pid_vals), HOMEPLUG_AV_PID_MASK, "Reserved", HFILL }
+          FT_UINT8, BASE_HEX, VALS(homeplug_av_pid_vals), HOMEPLUG_AV_PID_MASK, "Reserved", HFILL }
       },
       { &hf_homeplug_av_nw_info_prn,
         { "Protocol run number", "homeplug_av.nw_info.prn",
-	  FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }
+          FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }
       },
       { &hf_homeplug_av_nw_info_pmn,
         { "Protocol message number", "homeplug_av.nw_info.pmn",
-	  FT_UINT8, BASE_DEC, NULL, 0x00, NULL, HFILL }
+          FT_UINT8, BASE_DEC, NULL, 0x00, NULL, HFILL }
       },
       { &hf_homeplug_av_nw_info_my_nonce,
         { "My nonce", "homeplug_av.nw_info.my_nonce",
-	  FT_UINT32, BASE_HEX, NULL, 0x00, NULL, HFILL }
+          FT_UINT32, BASE_HEX, NULL, 0x00, NULL, HFILL }
       },
       { &hf_homeplug_av_nw_info_your_nonce,
         { "Your nonce", "homeplug_av.nw_info.your_nonce",
-	  FT_UINT32, BASE_HEX, NULL, 0x00, NULL, HFILL }
+          FT_UINT32, BASE_HEX, NULL, 0x00, NULL, HFILL }
       },
       { &hf_homeplug_av_nw_info_cco_cap,
         { "CCo capabilities", "homeplug_av.nw_info.cco_cap",
-	  FT_UINT8, BASE_HEX, VALS(homeplug_av_nw_info_role_vals), HOMEPLUG_AV_NW_INFO_ROLE_MASK, NULL, HFILL }
+          FT_UINT8, BASE_HEX, VALS(homeplug_av_nw_info_role_vals), HOMEPLUG_AV_NW_INFO_ROLE_MASK, NULL, HFILL }
       },
       { &hf_homeplug_av_nw_info_key_type,
         { "Key type", "homeplug_av.nw_info.key_type",
-	  FT_UINT8, BASE_HEX, VALS(homeplug_av_key_type_vals), HOMEPLUG_AV_KEY_TYPE_MASK, NULL, HFILL }
+          FT_UINT8, BASE_HEX, VALS(homeplug_av_key_type_vals), HOMEPLUG_AV_KEY_TYPE_MASK, NULL, HFILL }
       },
       /* Encrypted Payload Indicate */
       { &hf_homeplug_av_cm_enc_pld_ind,
         { "Encrypted Payload Indicate", "homeplug_av.cm_enc_pld_ind",
-	  FT_NONE, BASE_NONE, NULL, 0x00, NULL, HFILL }
+          FT_NONE, BASE_NONE, NULL, 0x00, NULL, HFILL }
       },
       { &hf_homeplug_av_cm_enc_pld_ind_avlns,
         { "AVLN status", "homeplug_av.cm_enc_pld_ind.avlns",
-	  FT_UINT8, BASE_HEX, VALS(homeplug_av_avln_status_vals), HOMEPLUG_AV_AVLN_STATUS_MASK, "Reserved", HFILL }
+          FT_UINT8, BASE_HEX, VALS(homeplug_av_avln_status_vals), HOMEPLUG_AV_AVLN_STATUS_MASK, "Reserved", HFILL }
       },
       { &hf_homeplug_av_cm_enc_pld_ind_iv,
         { "Initialization vector", "homeplug_av.cm_enc_pld_ind.iv",
-	  FT_BYTES, BASE_NONE, NULL, 0x00, NULL, HFILL }
+          FT_BYTES, BASE_NONE, NULL, 0x00, NULL, HFILL }
       },
       { &hf_homeplug_av_cm_enc_pld_ind_uuid,
         { "UUID", "homeplug_av.cm_enc_pld_ind.uuid",
-	  FT_GUID, BASE_NONE, NULL, 0x00, NULL, HFILL }
+          FT_GUID, BASE_NONE, NULL, 0x00, NULL, HFILL }
       },
       { &hf_homeplug_av_cm_enc_pld_ind_len,
         { "Length", "homeplug_av.cm_enc_pld_ind.len",
-	  FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }
+          FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }
       },
       { &hf_homeplug_av_cm_enc_pld_ind_pld,
         { "Encrypted payload", "homeplug_av.cm_enc_pld_ind.pld",
-	  FT_NONE, BASE_NONE, NULL, 0x00, NULL, HFILL }
+          FT_NONE, BASE_NONE, NULL, 0x00, NULL, HFILL }
       },
       /* Encrypted Payload Response */
       { &hf_homeplug_av_cm_enc_pld_rsp,
         { "Encrypted Payload Response", "homeplug_av.cm_enc_pld_rsp",
-	  FT_NONE, BASE_NONE, NULL, 0x00, NULL, HFILL }
+          FT_NONE, BASE_NONE, NULL, 0x00, NULL, HFILL }
       },
       { &hf_homeplug_av_cm_enc_pld_rsp_result,
         { "Result", "homeplug_av.cm_enc_pld_rsp.result",
-	  FT_UINT8, BASE_HEX, VALS(homeplug_av_generic_status_vals), HOMEPLUG_AV_GEN_STATUS_MASK, NULL, HFILL }
+          FT_UINT8, BASE_HEX, VALS(homeplug_av_generic_status_vals), HOMEPLUG_AV_GEN_STATUS_MASK, NULL, HFILL }
       },
       /* Set Key Request */
       { &hf_homeplug_av_cm_set_key_req,
         { "Set Key Request", "homeplug_av.cm_set_key_req",
-	  FT_NONE, BASE_NONE, NULL, 0x00, NULL, HFILL }
+          FT_NONE, BASE_NONE, NULL, 0x00, NULL, HFILL }
       },
       { &hf_homeplug_av_cm_set_key_req_nw_key,
         { "New Key", "homeplug_av.cm_set_key_req.nw_key",
-	  FT_BYTES, BASE_NONE, NULL, 0x00, NULL, HFILL }
+          FT_BYTES, BASE_NONE, NULL, 0x00, NULL, HFILL }
       },
       /* Set Key Confirmation */
       { &hf_homeplug_av_cm_set_key_cnf,
         { "Set Key Confirmation", "homeplug_av.cm_set_key_cnf",
-	  FT_NONE, BASE_NONE, NULL, 0x00, NULL, HFILL }
+          FT_NONE, BASE_NONE, NULL, 0x00, NULL, HFILL }
       },
       { &hf_homeplug_av_cm_set_key_cnf_result,
         { "Result", "homeplug_av.cm_set_key_cnf.result",
-	  FT_UINT8, BASE_HEX, VALS(homeplug_av_generic_status_vals), HOMEPLUG_AV_GEN_STATUS_MASK, NULL, HFILL }
+          FT_UINT8, BASE_HEX, VALS(homeplug_av_generic_status_vals), HOMEPLUG_AV_GEN_STATUS_MASK, NULL, HFILL }
       },
       /* Get Key Request */
       { &hf_homeplug_av_cm_get_key_req,
         { "Get Key request", "homeplug_av.cm_get_key_req",
-	  FT_NONE, BASE_NONE, NULL, 0x00, NULL, HFILL }
+          FT_NONE, BASE_NONE, NULL, 0x00, NULL, HFILL }
       },
       { &hf_homeplug_av_cm_get_key_req_type,
         { "Request type", "homeplug_av.cm_get_key_req.type",
-	  FT_UINT8, BASE_HEX, VALS(homeplug_av_req_type_vals), HOMEPLUG_AV_REQ_TYPE_MASK, "Reserved", HFILL }
+          FT_UINT8, BASE_HEX, VALS(homeplug_av_req_type_vals), HOMEPLUG_AV_REQ_TYPE_MASK, "Reserved", HFILL }
       },
       { &hf_homeplug_av_cm_get_key_req_has_key,
         { "Hash key", "homeplug_av.cm_get_key_req.hash_key",
-	  FT_BYTES, BASE_NONE, NULL, 0x00, NULL, HFILL }
+          FT_BYTES, BASE_NONE, NULL, 0x00, NULL, HFILL }
       },
       /* Get Key Confirmation */
       { &hf_homeplug_av_cm_get_key_cnf,
         { "Get Key Confirmation", "homeplug_av.cm_get_key_cnf",
-	  FT_NONE, BASE_NONE, NULL, 0x00, NULL, HFILL }
+          FT_NONE, BASE_NONE, NULL, 0x00, NULL, HFILL }
       },
       { &hf_homeplug_av_cm_get_key_cnf_result,
         { "Result", "homeplug_av.cm_get_key_cnf.result",
-	  FT_UINT8, BASE_HEX, VALS(homeplug_av_key_result_vals), HOMEPLUG_AV_KEY_RESULT_MASK, NULL, HFILL }
+          FT_UINT8, BASE_HEX, VALS(homeplug_av_key_result_vals), HOMEPLUG_AV_KEY_RESULT_MASK, NULL, HFILL }
       },
       { &hf_homeplug_av_cm_get_key_cnf_rtype,
         { "Requested key type", "homeplug_av.cm_get_key_cnf.rtype",
-	  FT_UINT8, BASE_HEX, VALS(homeplug_av_key_type_vals), HOMEPLUG_AV_KEY_TYPE_MASK, NULL, HFILL }
+          FT_UINT8, BASE_HEX, VALS(homeplug_av_key_type_vals), HOMEPLUG_AV_KEY_TYPE_MASK, NULL, HFILL }
       },
       { &hf_homeplug_av_cm_get_key_cnf_key,
         { "Encryption/Hash key", "homeplug_av.cm_get_key_cnf.key",
-	  FT_BYTES, BASE_NONE, NULL, 0x00, NULL, HFILL }
+          FT_BYTES, BASE_NONE, NULL, 0x00, NULL, HFILL }
       },
       /* Get Bridge Informations Confirmation */
       { &hf_homeplug_av_brg_infos_cnf,
         { "Get Bridge Informations Confirmation", "homeplug_av.brg_infos_cnf",
-	  FT_NONE, BASE_NONE, NULL, 0x00, NULL, HFILL }
+          FT_NONE, BASE_NONE, NULL, 0x00, NULL, HFILL }
       },
       { &hf_homeplug_av_brg_infos_cnf_brd,
         { "Bridging", "homeplug_av.brg_infos_cnf.brd",
-	  FT_BOOLEAN, BASE_NONE, NULL, 0x00, NULL, HFILL }
+          FT_BOOLEAN, BASE_NONE, NULL, 0x00, NULL, HFILL }
       },
       { &hf_homeplug_av_brg_infos_cnf_btei,
         { "Bridge Terminal Equipement Identifier", "homeplug_av.brg_infos_cnf.btei",
-	  FT_UINT8, BASE_DEC, NULL, 0x00, NULL, HFILL }
+          FT_UINT8, BASE_DEC, NULL, 0x00, NULL, HFILL }
       },
       { &hf_homeplug_av_brg_infos_cnf_num_stas,
         { "Number of stations", "homeplug_av.brg_infos_cnf.num_stas",
-	  FT_UINT8, BASE_DEC, NULL, 0x00, NULL, HFILL }
+          FT_UINT8, BASE_DEC, NULL, 0x00, NULL, HFILL }
       },
       { &hf_homeplug_av_brg_infos_cnf_mac,
         { "Bridged Destination Address", "homeplug_av.brg_infos_cnf.mac",
-	  FT_ETHER, BASE_NONE, NULL, 0x00, NULL, HFILL }
+          FT_ETHER, BASE_NONE, NULL, 0x00, NULL, HFILL }
       },
       /* Get Network Informations Confirmation */
       { &hf_homeplug_av_cm_nw_infos_cnf,
         { "Get Network Informations Confirmation", "homeplug_av.nw_infos_cnf",
-	  FT_NONE, BASE_NONE, NULL, 0x00, NULL, HFILL }
+          FT_NONE, BASE_NONE, NULL, 0x00, NULL, HFILL }
       },
       /* Get Network Statistics Confirmation */
       { &hf_homeplug_av_nw_stats_cnf,
         { "Get Network Statistics Confirmation", "homeplug_av.nw_stats_cnf",
-	  FT_NONE, BASE_NONE, NULL, 0x00, NULL, HFILL }
+          FT_NONE, BASE_NONE, NULL, 0x00, NULL, HFILL }
       },
       /* Vendor Specific */
       { &hf_homeplug_av_vendor,
         { "Vendor MME", "homeplug_av.vendor",
-	  FT_NONE, BASE_NONE, NULL, 0x00, NULL, HFILL }
+          FT_NONE, BASE_NONE, NULL, 0x00, NULL, HFILL }
       },
       { &hf_homeplug_av_vendor_oui,
         { "OUI", "homeplug_av.vendor.oui",
-	  FT_BYTES, BASE_NONE, NULL, 0x00, NULL, HFILL }
+          FT_BYTES, BASE_NONE, NULL, 0x00, NULL, HFILL }
       },
       /* Get Device/SW Version */
       { &hf_homeplug_av_get_sw_cnf,
         { "Get Device/SW Version", "homeplug_av.get_sw_cnf",
-	  FT_NONE, BASE_NONE, NULL, 0x00, NULL, HFILL }
+          FT_NONE, BASE_NONE, NULL, 0x00, NULL, HFILL }
       },
       { &hf_homeplug_av_get_sw_cnf_status,
         { "Status", "homeplug_av.get_sw_cnf.status",
-	  FT_UINT8, BASE_DEC, NULL, 0x00, NULL, HFILL }
+          FT_UINT8, BASE_DEC, NULL, 0x00, NULL, HFILL }
       },
       { &hf_homeplug_av_get_sw_cnf_dev_id,
         { "Device ID", "homeplug_av.get_sw_cnf.dev_id",
-	  FT_UINT8, BASE_HEX, VALS(homeplug_av_dev_id_vals), HOMEPLUG_AV_DEV_ID_MASK, NULL, HFILL }
+          FT_UINT8, BASE_HEX, VALS(homeplug_av_dev_id_vals), HOMEPLUG_AV_DEV_ID_MASK, NULL, HFILL }
       },
       { &hf_homeplug_av_get_sw_cnf_ver_len,
         { "Version length", "homeplug_av.get_sw_cnf.ver_len",
-	  FT_UINT8, BASE_DEC, NULL, 0x00, NULL, HFILL }
+          FT_UINT8, BASE_DEC, NULL, 0x00, NULL, HFILL }
       },
       { &hf_homeplug_av_get_sw_cnf_ver_str,
         { "Version", "homeplug_av.get_sw_cnf.ver_str",
-	  FT_STRING, BASE_NONE, NULL, 0x00, NULL, HFILL }
+          FT_STRING, BASE_NONE, NULL, 0x00, NULL, HFILL }
       },
       { &hf_homeplug_av_get_sw_cnf_upg,
         { "Upgradable", "homeplug_av.get_sw_cnf.upg",
-	  FT_BOOLEAN, BASE_NONE, NULL, 0x00, NULL, HFILL }
+          FT_BOOLEAN, BASE_NONE, NULL, 0x00, NULL, HFILL }
       },
       /* Write MAC Memory Request */
       { &hf_homeplug_av_wr_mem_req,
         { "Write MAC Memory Request", "homeplug_av.wr_mem_req",
-	  FT_NONE, BASE_NONE, NULL, 0x00, NULL, HFILL }
+          FT_NONE, BASE_NONE, NULL, 0x00, NULL, HFILL }
       },
       { &hf_homeplug_av_mem_addr,
         { "Address", "homeplug_av.mem.addr",
-	  FT_UINT32, BASE_HEX, NULL, 0x00, NULL, HFILL }
+          FT_UINT32, BASE_HEX, NULL, 0x00, NULL, HFILL }
       },
       { &hf_homeplug_av_mem_len_32bits,
         { "Length", "homeplug_av.mem.len_32bits",
-	  FT_UINT32, BASE_HEX, NULL, 0x00, NULL, HFILL }
+          FT_UINT32, BASE_HEX, NULL, 0x00, NULL, HFILL }
       },
       /* Write MAC Memory Confirmation */
       { &hf_homeplug_av_wr_mem_cnf,
         { "Write MAC Memory Confirmation", "homeplug_av.wr_mem_cnf",
-	  FT_NONE, BASE_NONE, NULL, 0x00, NULL, HFILL }
+          FT_NONE, BASE_NONE, NULL, 0x00, NULL, HFILL }
       },
       /* Read MAC Memory Request */
       { &hf_homeplug_av_rd_mem_req,
         { "Read MAC Memory Request", "homeplug_av.rd_mem_req",
-	  FT_NONE, BASE_NONE, NULL, 0x00, NULL, HFILL }
+          FT_NONE, BASE_NONE, NULL, 0x00, NULL, HFILL }
       },
       { &hf_homeplug_av_rd_mem_cnf,
         { "Read MAC Memory Confirmation", "homeplug_av.rd_mem_cnf",
-	  FT_NONE, BASE_NONE, NULL, 0x00, NULL, HFILL }
+          FT_NONE, BASE_NONE, NULL, 0x00, NULL, HFILL }
       },
       /* Start MAC Request */
       { &hf_homeplug_av_st_mac_req,
         { "Start MAC Request", "homeplug_av.st_mac_req",
-	  FT_NONE, BASE_NONE, NULL, 0x00, NULL, HFILL }
+          FT_NONE, BASE_NONE, NULL, 0x00, NULL, HFILL }
       },
       { &hf_homeplug_av_st_mac_req_img_load,
         { "Image Load Starting Address", "homeplug_av.st_mac_req.img_load",
-	  FT_UINT32, BASE_HEX, NULL, 0x00, "Unknown", HFILL }
+          FT_UINT32, BASE_HEX, NULL, 0x00, "Unknown", HFILL }
       },
       { &hf_homeplug_av_st_mac_req_img_len,
         { "Image Length", "homeplug_av.st_mac_req.img_len",
-	  FT_UINT32, BASE_HEX, NULL, 0x00, "Unknown", HFILL }
+          FT_UINT32, BASE_HEX, NULL, 0x00, "Unknown", HFILL }
       },
       { &hf_homeplug_av_st_mac_req_img_chksum,
         { "Image Checksum", "homeplug_av.st_mac_req.img_chksum",
-	  FT_UINT32, BASE_HEX, NULL, 0x00, "Unknown", HFILL }
+          FT_UINT32, BASE_HEX, NULL, 0x00, "Unknown", HFILL }
       },
       { &hf_homeplug_av_st_mac_req_img_start,
         { "Image Starting Address", "homeplug_av.st_mac_req.img_start",
-	  FT_UINT32, BASE_HEX, NULL, 0x00, "Unknown", HFILL }
+          FT_UINT32, BASE_HEX, NULL, 0x00, "Unknown", HFILL }
       },
       /* Start MAC Confirmation */
       { &hf_homeplug_av_st_mac_cnf,
         { "Start MAC Confirmation", "homeplug_av.st_mac_cnf",
-	  FT_NONE, BASE_NONE, NULL, 0x00, NULL, HFILL }
+          FT_NONE, BASE_NONE, NULL, 0x00, NULL, HFILL }
       },
       { &hf_homeplug_av_st_mac_cnf_status,
         { "Module ID", "homeplug_av.st_mac_cnf.status",
-	  FT_UINT8, BASE_HEX, VALS(homeplug_av_st_mac_status_vals), 0x00, "Unknown", HFILL }
+          FT_UINT8, BASE_HEX, VALS(homeplug_av_st_mac_status_vals), 0x00, "Unknown", HFILL }
       },
       /* Get NVM Parameters Confirmation */
       { &hf_homeplug_av_get_nvm_cnf,
         { "Get NVM Parameters Confirmation", "homeplug_av.get_nvm_cnf",
-	  FT_NONE, BASE_NONE, NULL, 0x00, NULL, HFILL }
+          FT_NONE, BASE_NONE, NULL, 0x00, NULL, HFILL }
       },
       { &hf_homeplug_av_get_nvm_cnf_status,
         { "Status", "homeplug_av.get_nvm_cnf.status",
-	  FT_UINT8, BASE_HEX, VALS(homeplug_av_get_nvm_status_vals), 0x00, "Unknown", HFILL }
+          FT_UINT8, BASE_HEX, VALS(homeplug_av_get_nvm_status_vals), 0x00, "Unknown", HFILL }
       },
       { &hf_homeplug_av_get_nvm_cnf_nvm_type,
         { "NVM Type", "homeplug_av.get_nvm_cnf.nvm_type",
-	  FT_UINT32, BASE_HEX, NULL, 0x00, "Unknown", HFILL }
+          FT_UINT32, BASE_HEX, NULL, 0x00, "Unknown", HFILL }
       },
       { &hf_homeplug_av_get_nvm_cnf_nvm_page,
         { "NVM Page Size", "homeplug_av.get_nvm_cnf.nvm_page",
-	  FT_UINT32, BASE_HEX, NULL, 0x00, "Unknown", HFILL }
+          FT_UINT32, BASE_HEX, NULL, 0x00, "Unknown", HFILL }
       },
       { &hf_homeplug_av_get_nvm_cnf_nvm_block,
         { "NVM Block Size", "homeplug_av.get_nvm_cnf.nvm_block",
-	  FT_UINT32, BASE_HEX, NULL, 0x00, "Unknown", HFILL }
+          FT_UINT32, BASE_HEX, NULL, 0x00, "Unknown", HFILL }
       },
       { &hf_homeplug_av_get_nvm_cnf_nvm_size,
         { "NVM Memory Size", "homeplug_av.get_nvm_cnf.nvm_size",
-	  FT_UINT32, BASE_HEX, NULL, 0x00, "Unknown", HFILL }
+          FT_UINT32, BASE_HEX, NULL, 0x00, "Unknown", HFILL }
       },
       /* Reset Device Confirmation */
       { &hf_homeplug_av_rs_dev_cnf,
         { "Reset Device Confirmation", "homeplug_av.rs_dev_cnf",
-	  FT_NONE, BASE_NONE, NULL, 0x00, NULL, HFILL }
+          FT_NONE, BASE_NONE, NULL, 0x00, NULL, HFILL }
       },
       { &hf_homeplug_av_rs_dev_cnf_status,
         { "Status", "homeplug_av.rs_dev_cnf.status",
-	  FT_UINT8, BASE_HEX, VALS(homeplug_av_rs_dev_status_vals), 0x00, "Unknown", HFILL }
+          FT_UINT8, BASE_HEX, VALS(homeplug_av_rs_dev_status_vals), 0x00, "Unknown", HFILL }
       },
       /* Shared memory related fields */
       { &hf_homeplug_av_mem_len_16bits,
         { "Length", "homeplug_av.mem.len_16bits",
-	  FT_UINT16, BASE_HEX, NULL, 0x00, NULL, HFILL }
+          FT_UINT16, BASE_HEX, NULL, 0x00, NULL, HFILL }
       },
       { &hf_homeplug_av_mem_offset,
         { "Offset", "homeplug_av.mem.offset",
-	  FT_UINT32, BASE_HEX, NULL, 0x00, NULL, HFILL }
+          FT_UINT32, BASE_HEX, NULL, 0x00, NULL, HFILL }
       },
       { &hf_homeplug_av_mem_checksum,
         { "Checksum", "homeplug_av.mem.checksum",
-	  FT_UINT32, BASE_HEX, NULL, 0x00, NULL, HFILL }
+          FT_UINT32, BASE_HEX, NULL, 0x00, NULL, HFILL }
       },
       { &hf_homeplug_av_mem_data,
         { "Data", "homeplug_av.mem.data",
-	  FT_NONE, BASE_NONE, NULL, 0x00, NULL, HFILL }
+          FT_NONE, BASE_NONE, NULL, 0x00, NULL, HFILL }
       },
       { &hf_homeplug_av_mem_status,
         { "Status", "homeplug_av.mem.status",
-	  FT_UINT8, BASE_HEX, VALS(homeplug_av_wr_rd_mem_status_vals), 0x00, "Unknown", HFILL }
+          FT_UINT8, BASE_HEX, VALS(homeplug_av_wr_rd_mem_status_vals), 0x00, "Unknown", HFILL }
       },
       /* Write Module Data Request */
       { &hf_homeplug_av_wr_mod_req,
         { "Write Module Data Request", "homeplug_av.wr_mod_req",
-	  FT_NONE, BASE_NONE, NULL, 0x00, NULL, HFILL }
+          FT_NONE, BASE_NONE, NULL, 0x00, NULL, HFILL }
       },
       /* Write Module Data Confirmation */
       { &hf_homeplug_av_wr_mod_cnf,
         { "Write Module Data Confirmation", "homeplug_av.wr_mod_cnf",
-	  FT_NONE, BASE_NONE, NULL, 0x00, NULL, HFILL }
+          FT_NONE, BASE_NONE, NULL, 0x00, NULL, HFILL }
       },
       { &hf_homeplug_av_wr_mod_cnf_status,
         { "Status", "homeplug_av.wr_mod_cnf.status",
-	  FT_UINT8, BASE_HEX, VALS(homeplug_av_wr_rd_mod_cnf_status_vals), 0x00, "Unknown", HFILL }
+          FT_UINT8, BASE_HEX, VALS(homeplug_av_wr_rd_mod_cnf_status_vals), 0x00, "Unknown", HFILL }
       },
       /* Write Module Data Indicate */
       { &hf_homeplug_av_wr_mod_ind,
         { "Write Module Data Indicate", "homeplug_av.wr_mod_ind",
-	  FT_NONE, BASE_NONE, NULL, 0x00, NULL, HFILL }
+          FT_NONE, BASE_NONE, NULL, 0x00, NULL, HFILL }
       },
       { &hf_homeplug_av_wr_mod_ind_status,
         { "Status", "homeplug_av.wr_mod_ind.status",
-	  FT_UINT8, BASE_HEX, VALS(homeplug_av_wr_mod_ind_status_vals), 0x00, "Unknown", HFILL }
+          FT_UINT8, BASE_HEX, VALS(homeplug_av_wr_mod_ind_status_vals), 0x00, "Unknown", HFILL }
       },
       /* Read Module Data Request */
       { &hf_homeplug_av_rd_mod_req,
         { "Read Module Data Request", "homeplug_av.rd_mod_req",
-	  FT_NONE, BASE_NONE, NULL, 0x00, NULL, HFILL }
+          FT_NONE, BASE_NONE, NULL, 0x00, NULL, HFILL }
       },
       /* Read Module Data Confirmation */
       { &hf_homeplug_av_rd_mod_cnf,
         { "Read Module Data Confirmation", "homeplug_av.rd_mod_cnf",
-	  FT_NONE, BASE_NONE, NULL, 0x00, NULL, HFILL }
+          FT_NONE, BASE_NONE, NULL, 0x00, NULL, HFILL }
       },
       { &hf_homeplug_av_rd_mod_cnf_status,
         { "Status", "homeplug_av.rd_mod_cnf.status",
-	  FT_UINT8, BASE_HEX, VALS(homeplug_av_wr_rd_mod_cnf_status_vals), 0x00, "Unknown", HFILL }
+          FT_UINT8, BASE_HEX, VALS(homeplug_av_wr_rd_mod_cnf_status_vals), 0x00, "Unknown", HFILL }
       },
       { &hf_homeplug_av_mac_module_id,
         { "Module ID", "homeplug_av.module_id",
-	  FT_UINT8, BASE_HEX, VALS(homeplug_av_mac_module_id_vals), 0x00, "Unknown", HFILL }
+          FT_UINT8, BASE_HEX, VALS(homeplug_av_mac_module_id_vals), 0x00, "Unknown", HFILL }
       },
       /* Write Module Data to NVM Request */
       { &hf_homeplug_av_mod_nvm_req,
         { "Write Module Data to NVM Request", "homeplug_av.mod_nvm_req",
-	  FT_NONE, BASE_NONE, NULL, 0x00, NULL, HFILL }
+          FT_NONE, BASE_NONE, NULL, 0x00, NULL, HFILL }
       },
       /* Write Module Data to NVM Confirmation */
       { &hf_homeplug_av_mod_nvm_cnf,
         { "Write Module Data to NVM Confirmation", "homeplug_av.mod_nvm_cnf",
-	  FT_NONE, BASE_NONE, NULL, 0x00, NULL, HFILL }
+          FT_NONE, BASE_NONE, NULL, 0x00, NULL, HFILL }
       },
       { &hf_homeplug_av_mod_nvm_cnf_status,
         { "Status", "homeplug_av.mod_nvm_cnf.status",
-	  FT_UINT8, BASE_HEX, VALS(homeplug_av_mod_nvm_status_vals), 0x00, "Unknown", HFILL }
+          FT_UINT8, BASE_HEX, VALS(homeplug_av_mod_nvm_status_vals), 0x00, "Unknown", HFILL }
       },
       /* Get Watchdog Report Request */
       { &hf_homeplug_av_wd_rpt_req,
         { "Get Watchdog Report Request", "homeplug_av.wd_rpt_req",
-	  FT_NONE, BASE_NONE, NULL, 0x00, NULL, HFILL }
+          FT_NONE, BASE_NONE, NULL, 0x00, NULL, HFILL }
       },
       { &hf_homeplug_av_wd_rpt_req_session_id,
         { "Session ID", "homeplug_av.wd_rpt_req.session_id",
-	  FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }
+          FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }
       },
       { &hf_homeplug_av_wd_rpt_req_clr,
         { "Clear flag", "homeplug_av.wd_rpt_req.clr",
-	  FT_UINT8, BASE_HEX, VALS(homeplug_av_rpt_clr_vals), HOMEPLUG_AV_RPT_CLR_MASK, "Unknown", HFILL }
+          FT_UINT8, BASE_HEX, VALS(homeplug_av_rpt_clr_vals), HOMEPLUG_AV_RPT_CLR_MASK, "Unknown", HFILL }
       },
       /* Get Watchdog Report Indicate */
       { &hf_homeplug_av_wd_rpt_ind,
         { "Get Watchdog Report Indicate", "homeplug_av.wd_rpt_ind",
-	  FT_NONE, BASE_NONE, NULL, 0x00, NULL, HFILL }
+          FT_NONE, BASE_NONE, NULL, 0x00, NULL, HFILL }
       },
       { &hf_homeplug_av_wd_rpt_ind_status,
         { "Status", "homeplug_av.wd_rpt_ind.status",
-	  FT_UINT8, BASE_HEX, VALS(homeplug_av_generic_status_vals), HOMEPLUG_AV_GEN_STATUS_MASK, "Unknown", HFILL }
+          FT_UINT8, BASE_HEX, VALS(homeplug_av_generic_status_vals), HOMEPLUG_AV_GEN_STATUS_MASK, "Unknown", HFILL }
       },
       { &hf_homeplug_av_wd_rpt_ind_session_id,
         { "Session ID", "homeplug_av.wd_rpt_ind.session_id",
-	  FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }
+          FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }
       },
       { &hf_homeplug_av_wd_rpt_ind_num_parts,
         { "Number of parts", "homeplug_av.wd_rpt_ind.num_parts",
-	  FT_UINT8, BASE_DEC, NULL, 0x00, NULL, HFILL }
+          FT_UINT8, BASE_DEC, NULL, 0x00, NULL, HFILL }
       },
       { &hf_homeplug_av_wd_rpt_ind_curr_part,
         { "Current Part", "homeplug_av.wd_rpt_ind.curr_part",
-	  FT_UINT8, BASE_DEC, NULL, 0x00, NULL, HFILL }
+          FT_UINT8, BASE_DEC, NULL, 0x00, NULL, HFILL }
       },
       { &hf_homeplug_av_wd_rpt_ind_rdata_len,
         { "Report Data Length", "homeplug_av.wd_rpt_ind.rdata_len",
-	  FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }
+          FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }
       },
       { &hf_homeplug_av_wd_rpt_ind_rdata_ofs,
         { "Report Data Offset", "homeplug_av.wd_rpt_ind.rdata_offset",
-	  FT_UINT8, BASE_HEX, NULL, 0x00, NULL, HFILL }
+          FT_UINT8, BASE_HEX, NULL, 0x00, NULL, HFILL }
       },
       { &hf_homeplug_av_wd_rpt_ind_rdata,
         { "Report Data", "homeplug_av.wd_rpt_ind.rdata",
-	  FT_NONE, BASE_NONE, NULL, 0x00, NULL, HFILL }
+          FT_NONE, BASE_NONE, NULL, 0x00, NULL, HFILL }
       },
       /* Link Statistics Request */
       { &hf_homeplug_av_lnk_stats_req,
         { "Link Statistics Request", "homeplug_av.lnk_stats_req",
-	  FT_NONE, BASE_NONE, NULL, 0x00, NULL, HFILL }
+          FT_NONE, BASE_NONE, NULL, 0x00, NULL, HFILL }
       },
       { &hf_homeplug_av_lnk_stats_req_mcontrol,
         { "Control", "homeplug_av.lnk_stats_req.mcontrol",
-	  FT_UINT8, BASE_HEX, VALS(homeplug_av_lnk_stats_mctrl_vals), HOMEPLUG_AV_LNK_STATS_MCTL_MASK, "Unknown", HFILL }
+          FT_UINT8, BASE_HEX, VALS(homeplug_av_lnk_stats_mctrl_vals), HOMEPLUG_AV_LNK_STATS_MCTL_MASK, "Unknown", HFILL }
       },
       { &hf_homeplug_av_lnk_stats_req_dir,
         { "Direction", "homeplug_av.lnk_stats_req.dir",
-	  FT_UINT8, BASE_HEX, VALS(homeplug_av_lnk_stats_dir_vals), HOMEPLUG_AV_LNK_STATS_DIR_MASK, "Unknown", HFILL }
+          FT_UINT8, BASE_HEX, VALS(homeplug_av_lnk_stats_dir_vals), HOMEPLUG_AV_LNK_STATS_DIR_MASK, "Unknown", HFILL }
       },
       { &hf_homeplug_av_lnk_stats_req_lid,
         { "Link ID", "homeplug_av.lnk_stats_req.lid",
-	  FT_UINT8, BASE_HEX, VALS(homeplug_av_lnk_stats_lid_vals), 0x00, "Unknown", HFILL }
+          FT_UINT8, BASE_HEX, VALS(homeplug_av_lnk_stats_lid_vals), 0x00, "Unknown", HFILL }
       },
       { &hf_homeplug_av_lnk_stats_req_macaddr,
         { "Peer Node", "homeplug_av.lnk_stats_req.macaddr",
-	  FT_ETHER, BASE_NONE, NULL, 0x00, NULL, HFILL }
+          FT_ETHER, BASE_NONE, NULL, 0x00, NULL, HFILL }
       },
       /* Link Statistics Confirmation */
       { &hf_homeplug_av_lnk_stats_cnf,
         { "Link Statistics Confirmation", "homeplug_av.lnk_stats_cnf",
-	  FT_NONE, BASE_NONE, NULL, 0x00, NULL, HFILL }
+          FT_NONE, BASE_NONE, NULL, 0x00, NULL, HFILL }
       },
       { &hf_homeplug_av_lnk_stats_cnf_status,
         { "Status", "homeplug_av.lnk_stats_cnf.status",
-	  FT_UINT8, BASE_HEX, VALS(homeplug_av_lnk_status_vals), 0x00, "Unknown", HFILL }
+          FT_UINT8, BASE_HEX, VALS(homeplug_av_lnk_status_vals), 0x00, "Unknown", HFILL }
       },
       { &hf_homeplug_av_lnk_stats_cnf_dir,
         { "Direction", "homeplug_av.lnk_stats_cnf.dir",
-	  FT_UINT8, BASE_HEX, VALS(homeplug_av_lnk_stats_dir_vals), HOMEPLUG_AV_LNK_STATS_DIR_MASK, "Unknown", HFILL }
+          FT_UINT8, BASE_HEX, VALS(homeplug_av_lnk_stats_dir_vals), HOMEPLUG_AV_LNK_STATS_DIR_MASK, "Unknown", HFILL }
       },
       { &hf_homeplug_av_lnk_stats_cnf_lid,
         { "Link ID", "homeplug_av.lnk_stats_cnf.lid",
-	  FT_UINT8, BASE_HEX, VALS(homeplug_av_lnk_stats_lid_vals), 0x00, "Unknown", HFILL }
+          FT_UINT8, BASE_HEX, VALS(homeplug_av_lnk_stats_lid_vals), 0x00, "Unknown", HFILL }
       },
       { &hf_homeplug_av_lnk_stats_cnf_tei,
         { "TEI", "homeplug_av.lnk_stats_cnf.tei",
-	  FT_UINT8, BASE_HEX, NULL, 0x00, NULL, HFILL }
+          FT_UINT8, BASE_HEX, NULL, 0x00, NULL, HFILL }
       },
       { &hf_homeplug_av_lnk_stats_cnf_lstats,
         { "Link statistics", "homeplug_av.lnk_stats_cnf.lstats",
-	  FT_NONE, BASE_NONE, NULL, 0x00, NULL, HFILL }
+          FT_NONE, BASE_NONE, NULL, 0x00, NULL, HFILL }
       },
       /* Link statistics members */
       { &hf_homeplug_av_lnk_stats_tx,
         { "Tx link statistics", "homeplug_av.lnk_stats.tx",
-	  FT_NONE, BASE_NONE, NULL, 0x00, NULL, HFILL }
+          FT_NONE, BASE_NONE, NULL, 0x00, NULL, HFILL }
       },
       { &hf_homeplug_av_lnk_stats_tx_mpdu_ack,
         { "Number of MPDUs Transmitted and Acknowledged", "homeplug_av.lnk_stats.tx.mpdu_ack",
-	  FT_UINT64, BASE_DEC, NULL, 0x00, NULL, HFILL }
+          FT_UINT64, BASE_DEC, NULL, 0x00, NULL, HFILL }
       },
       { &hf_homeplug_av_lnk_stats_tx_mpdu_col,
         { "Number of MPDUs Transmitted and Collided", "homeplug_av.lnk_stats.tx.mpdu_col",
-	  FT_UINT64, BASE_DEC, NULL, 0x00, NULL, HFILL }
+          FT_UINT64, BASE_DEC, NULL, 0x00, NULL, HFILL }
       },
       { &hf_homeplug_av_lnk_stats_tx_mpdu_fai,
         { "Number of MPDUs Transmitted and Failed", "homeplug_av.lnk_stats.tx.mpdu_fail",
-	  FT_UINT64, BASE_DEC, NULL, 0x00, NULL, HFILL }
+          FT_UINT64, BASE_DEC, NULL, 0x00, NULL, HFILL }
       },
       { &hf_homeplug_av_lnk_stats_tx_pbs_pass,
         { "Number of PB Transmitted Successfully", "homeplug_av.lnk_stats.tx.pbs_pass",
-	  FT_UINT64, BASE_DEC, NULL, 0x00, NULL, HFILL }
+          FT_UINT64, BASE_DEC, NULL, 0x00, NULL, HFILL }
       },
       { &hf_homeplug_av_lnk_stats_tx_pbs_fail,
         { "Number of PB Transmitted Unsuccessfully", "homeplug_av.lnk_stats.tx.pbs_fail",
-	  FT_UINT64, BASE_DEC, NULL, 0x00, NULL, HFILL }
+          FT_UINT64, BASE_DEC, NULL, 0x00, NULL, HFILL }
       },
       { &hf_homeplug_av_lnk_stats_rx,
         { "Rx link statistics", "homeplug_av.lnk_stats.rx",
-	  FT_NONE, BASE_NONE, NULL, 0x00, NULL, HFILL }
+          FT_NONE, BASE_NONE, NULL, 0x00, NULL, HFILL }
       },
       { &hf_homeplug_av_lnk_stats_rx_mpdu_ack,
         { "Number of MPDUs Received and Acknowledged", "homeplug_av.lnk_stats.rx.mdpu_ack",
-	  FT_UINT64, BASE_DEC, NULL, 0x00, NULL, HFILL }
+          FT_UINT64, BASE_DEC, NULL, 0x00, NULL, HFILL }
       },
       { &hf_homeplug_av_lnk_stats_rx_mpdu_fai,
         { "Number of MPDUs Received and Failed", "homeplug_av.lnk_stats.rx.mdpu_fail",
-	  FT_UINT64, BASE_DEC, NULL, 0x00, NULL, HFILL }
+          FT_UINT64, BASE_DEC, NULL, 0x00, NULL, HFILL }
       },
       { &hf_homeplug_av_lnk_stats_rx_pbs_pass,
         { "Number of PB Received Successfully", "homeplug_av.lnk_stats.rx.pbs_pass",
-	  FT_UINT64, BASE_DEC, NULL, 0x00, NULL, HFILL }
+          FT_UINT64, BASE_DEC, NULL, 0x00, NULL, HFILL }
       },
       { &hf_homeplug_av_lnk_stats_rx_pbs_fail,
         { "Number of PB Received Unsuccessfully", "homeplug_av.lnk_stats.rx.pbs_fail",
-	  FT_UINT64, BASE_DEC, NULL, 0x00, NULL, HFILL }
+          FT_UINT64, BASE_DEC, NULL, 0x00, NULL, HFILL }
       },
       { &hf_homeplug_av_lnk_stats_rx_tb_pass,
         { "Sum of Turbo Bit Error over successfully recevied PBs", "homeplug_av.lnk_stats.rx.tb_pass",
-	  FT_UINT64, BASE_DEC, NULL, 0x00, NULL, HFILL }
+          FT_UINT64, BASE_DEC, NULL, 0x00, NULL, HFILL }
       },
       { &hf_homeplug_av_lnk_stats_rx_tb_fail,
         { "Sum of Turbo Bit Error over unsuccessfully recevied PBs", "homeplug_av.lnk_stats.rx.tb_fail",
-	  FT_UINT64, BASE_DEC, NULL, 0x00, NULL, HFILL }
+          FT_UINT64, BASE_DEC, NULL, 0x00, NULL, HFILL }
       },
       { &hf_homeplug_av_lnk_stats_rx_num_int,
         { "Number of Tone Map Intervals", "homeplug_av.lnk_stats.rx.num_int",
-	  FT_UINT8, BASE_DEC, NULL, 0x00, NULL, HFILL }
+          FT_UINT8, BASE_DEC, NULL, 0x00, NULL, HFILL }
       },
       { &hf_homeplug_av_rx_inv_stats,
         { "Rx Interval Statistics", "homeplug_av.lnk_stats.rx.inv",
-	  FT_NONE, BASE_NONE, NULL, 0x00, NULL, HFILL }
+          FT_NONE, BASE_NONE, NULL, 0x00, NULL, HFILL }
       },
       { &hf_homeplug_av_rx_inv_phy_rate,
         { "Rx Phy Rate for Tone Map Interval 0", "homeplug_av.lnk_stats.rx.inv.phy_rate",
-	  FT_UINT8, BASE_DEC, NULL, 0x00, NULL, HFILL }
+          FT_UINT8, BASE_DEC, NULL, 0x00, NULL, HFILL }
       },
       { &hf_homeplug_av_rx_inv_pbs_pass,
         { "Number of PB Received Successfully", "homeplug_av.lnk_stats.rx.inv.pbs_pass",
-	  FT_UINT64, BASE_DEC, NULL, 0x00, NULL, HFILL }
+          FT_UINT64, BASE_DEC, NULL, 0x00, NULL, HFILL }
       },
       { &hf_homeplug_av_rx_inv_pbs_fail,
         { "Number of PB Received Unsuccessfully", "homeplug_av.lnk_stats.rx.inv.pbs_fail",
-	  FT_UINT64, BASE_DEC, NULL, 0x00, NULL, HFILL }
+          FT_UINT64, BASE_DEC, NULL, 0x00, NULL, HFILL }
       },
       { &hf_homeplug_av_rx_inv_tb_pass,
         { "Sum of the Turbo Bit Error over all PBs received successfully", "homeplug_av.lnk_stats.rx.inv.tb_pass",
-	  FT_UINT64, BASE_DEC, NULL, 0x00, NULL, HFILL }
+          FT_UINT64, BASE_DEC, NULL, 0x00, NULL, HFILL }
       },
       { &hf_homeplug_av_rx_inv_tb_fail,
         { "Sum of the Turbo Bit Error over all PBs received unsuccessfully", "homeplug_av.lnk_stats.rx.inv.tb_fail",
-	  FT_UINT64, BASE_DEC, NULL, 0x00, NULL, HFILL }
+          FT_UINT64, BASE_DEC, NULL, 0x00, NULL, HFILL }
       },
       /* Sniffer Request */
       { &hf_homeplug_av_sniffer_req,
         { "Sniffer Request", "homeplug_av.sniffer_req",
-	  FT_NONE, BASE_NONE, NULL, 0x00, NULL, HFILL }
+          FT_NONE, BASE_NONE, NULL, 0x00, NULL, HFILL }
       },
       { &hf_homeplug_av_sniffer_req_ctrl,
         { "Sniffer Control", "homeplug_av.sniffer_req.ctrl",
-	  FT_UINT8, BASE_HEX, VALS(homeplug_av_sniffer_ctrl_vals), HOMEPLUG_AV_SNIFFER_CTRL_MASK, NULL, HFILL }
+          FT_UINT8, BASE_HEX, VALS(homeplug_av_sniffer_ctrl_vals), HOMEPLUG_AV_SNIFFER_CTRL_MASK, NULL, HFILL }
       },
       /* Sniffer Confirmation */
       { &hf_homeplug_av_sniffer_cnf,
         { "Sniffer Confirmation" , "homeplug_av.sniffer_cnf",
-	  FT_NONE, BASE_NONE, NULL, 0x00, NULL, HFILL }
+          FT_NONE, BASE_NONE, NULL, 0x00, NULL, HFILL }
       },
       { &hf_homeplug_av_sniffer_cnf_status,
         { "Status", "homeplug_av.sniffer_cnf.status",
-	  FT_UINT8, BASE_HEX, VALS(homeplug_av_sniffer_status_vals), 0x00, NULL, HFILL }
+          FT_UINT8, BASE_HEX, VALS(homeplug_av_sniffer_status_vals), 0x00, NULL, HFILL }
       },
       { &hf_homeplug_av_sniffer_cnf_state,
         { "State", "homeplug_av.sniffer_cnf.state",
-	  FT_BOOLEAN, BASE_NONE, NULL, 0x00, NULL, HFILL }
+          FT_BOOLEAN, BASE_NONE, NULL, 0x00, NULL, HFILL }
       },
       { &hf_homeplug_av_sniffer_cnf_da,
         { "Destination address", "homeplug_av.sniffer_cnf.da",
-	  FT_ETHER, BASE_NONE, NULL, 0x00, NULL, HFILL }
+          FT_ETHER, BASE_NONE, NULL, 0x00, NULL, HFILL }
       },
       /* Sniffer Indicate */
       { &hf_homeplug_av_sniffer_ind,
         { "Sniffer Indicate", "homeplug_av.sniffer_ind",
-	  FT_NONE, BASE_NONE, NULL, 0x00, NULL, HFILL }
+          FT_NONE, BASE_NONE, NULL, 0x00, NULL, HFILL }
       },
       { &hf_homeplug_av_sniffer_ind_type,
         { "Sniffer Type", "homeplug_av.sniffer_ind.type",
-	  FT_UINT8, BASE_HEX, VALS(homeplug_av_sniffer_type_vals), 0x00, "Unknown", HFILL }
+          FT_UINT8, BASE_HEX, VALS(homeplug_av_sniffer_type_vals), 0x00, "Unknown", HFILL }
       },
       { &hf_homeplug_av_sniffer_ind_data,
         { "Sniffer Data", "homeplug_av.sniffer_ind.data",
-	  FT_NONE, BASE_NONE, NULL, 0x00, NULL, HFILL }
+          FT_NONE, BASE_NONE, NULL, 0x00, NULL, HFILL }
       },
       { &hf_homeplug_av_sniffer_data_dir,
         { "Direction", "homeplug_av.sniffer_ind.data.dir",
-	  FT_UINT8, BASE_HEX, VALS(homeplug_av_lnk_stats_dir_vals), HOMEPLUG_AV_LNK_STATS_DIR_MASK, NULL, HFILL }
+          FT_UINT8, BASE_HEX, VALS(homeplug_av_lnk_stats_dir_vals), HOMEPLUG_AV_LNK_STATS_DIR_MASK, NULL, HFILL }
       },
       { &hf_homeplug_av_sniffer_data_systime,
         { "System time", "homeplug_av.sniffer_ind.data.systime",
-	  FT_UINT64, BASE_DEC, NULL, 0x00, NULL, HFILL }
+          FT_UINT64, BASE_DEC, NULL, 0x00, NULL, HFILL }
       },
       { &hf_homeplug_av_sniffer_data_bc_time,
         { "Beacon time", "homeplug_av.sniffer_ind.data.bc_time",
-	  FT_UINT32, BASE_DEC, NULL, 0x00, NULL, HFILL }
+          FT_UINT32, BASE_DEC, NULL, 0x00, NULL, HFILL }
       },
       /* Network Info Confirmation */
       { &hf_homeplug_av_nw_info_cnf,
         { "Network Info Confirmation", "homeplug_av.nw_info_cnf",
-	  FT_NONE, BASE_NONE, NULL, 0x00, NULL, HFILL }
+          FT_NONE, BASE_NONE, NULL, 0x00, NULL, HFILL }
       },
       { &hf_homeplug_av_nw_info_net_info,
         { "Networks informations", "homeplug_av.nw_info_cnf.net_info",
-	  FT_NONE, BASE_NONE, NULL, 0x00, NULL, HFILL }
+          FT_NONE, BASE_NONE, NULL, 0x00, NULL, HFILL }
       },
       { &hf_homeplug_av_nw_info_num_avlns,
         { "Number of AV Logical Networks", "homeplug_av.nw_info.num_avlns",
-	  FT_UINT8, BASE_DEC, NULL, 0x00, NULL, HFILL }
+          FT_UINT8, BASE_DEC, NULL, 0x00, NULL, HFILL }
       },
       { &hf_homeplug_av_nw_info_nid,
         { "Network ID", "homeplug_av.nw_info.nid",
-	  FT_BYTES, BASE_NONE, NULL, 0x00, NULL, HFILL }
+          FT_BYTES, BASE_NONE, NULL, 0x00, NULL, HFILL }
       },
       { &hf_homeplug_av_nw_info_snid,
         { "Short Network ID", "homeplug_av.nw_info.snid",
-	  FT_UINT8, BASE_HEX, NULL, 0x00, NULL, HFILL }
+          FT_UINT8, BASE_HEX, NULL, 0x00, NULL, HFILL }
       },
       { &hf_homeplug_av_nw_info_tei,
         { "Terminal Equipement Identifer", "homeplug_av.nw_info.tei",
-	  FT_UINT8, BASE_DEC, NULL, 0x00, NULL, HFILL }
+          FT_UINT8, BASE_DEC, NULL, 0x00, NULL, HFILL }
       },
       { &hf_homeplug_av_nw_info_sta_role,
         { "Station Role", "homeplug_av.nw_info.sta_role",
-	  FT_UINT8, BASE_HEX, VALS(homeplug_av_nw_info_role_vals), HOMEPLUG_AV_NW_INFO_ROLE_MASK, "Reserved", HFILL }
+          FT_UINT8, BASE_HEX, VALS(homeplug_av_nw_info_role_vals), HOMEPLUG_AV_NW_INFO_ROLE_MASK, "Reserved", HFILL }
       },
       { &hf_homeplug_av_nw_info_cco_mac,
         { "CCo MAC Address", "homeplug_av.nw_info_cnf.cco_mac",
-	  FT_ETHER, BASE_NONE, NULL, 0x00, NULL, HFILL }
+          FT_ETHER, BASE_NONE, NULL, 0x00, NULL, HFILL }
       },
       { &hf_homeplug_av_nw_info_cco_tei,
         { "CCo Terminal Equipement Identifier", "homeplug_av.nw_info_cnf.cco_tei",
-	  FT_UINT8, BASE_DEC, NULL, 0x00, NULL, HFILL }
+          FT_UINT8, BASE_DEC, NULL, 0x00, NULL, HFILL }
       },
       { &hf_homeplug_av_nw_info_num_stas,
         { "Number of AV Stations", "homeplug_av.nw_info_cnf.num_stas",
-	  FT_UINT8, BASE_DEC, NULL, 0x00, NULL, HFILL }
+          FT_UINT8, BASE_DEC, NULL, 0x00, NULL, HFILL }
       },
       { &hf_homeplug_av_nw_info_access,
         { "Access network", "homeplug_av.nw_info_cnf.access",
-	  FT_UINT8, BASE_HEX, VALS(homeplug_nw_info_access_vals), HOMEPLUG_AV_NW_INFO_NID_MASK, "Reserved", HFILL }
+          FT_UINT8, BASE_HEX, VALS(homeplug_nw_info_access_vals), HOMEPLUG_AV_NW_INFO_NID_MASK, "Reserved", HFILL }
       },
       { &hf_homeplug_av_nw_info_num_coord,
         { "Number of neighbor networks coordinating", "homeplug_av.nw_info_cnf.num_coord",
-	  FT_UINT8, BASE_DEC, NULL, 0x00, NULL, HFILL }
+          FT_UINT8, BASE_DEC, NULL, 0x00, NULL, HFILL }
       },
       /* Network Info per station */
       { &hf_homeplug_av_nw_info_sta_info,
         { "Stations Informations", "homeplug_av.nw_info_cnf.sta_info",
-	  FT_NONE, BASE_NONE, NULL, 0x00, NULL, HFILL }
+          FT_NONE, BASE_NONE, NULL, 0x00, NULL, HFILL }
       },
       { &hf_homeplug_av_nw_info_sta_da,
         { "Station MAC Address", "homeplug_av.nw_info_cnf.sta_info.da",
-	  FT_ETHER, BASE_NONE, NULL, 0x00, NULL, HFILL }
+          FT_ETHER, BASE_NONE, NULL, 0x00, NULL, HFILL }
       },
       { &hf_homeplug_av_nw_info_sta_tei,
         { "Station Terminal Equipement Identifier", "homeplug_av.nw_info_cnf.sta_indo.tei",
-	  FT_UINT8, BASE_DEC, NULL, 0x00, NULL, HFILL }
+          FT_UINT8, BASE_DEC, NULL, 0x00, NULL, HFILL }
       },
       { &hf_homeplug_av_nw_info_sta_bda,
         { "MAC Address of first Node Bridged by Station", "homeplug_av.nw_info_cnf.sta_indo.bda",
-	  FT_ETHER, BASE_NONE, NULL, 0x00, NULL, HFILL }
+          FT_ETHER, BASE_NONE, NULL, 0x00, NULL, HFILL }
       },
       { &hf_homeplug_av_nw_info_sta_phy_dr_tx,
         { "Average PHY Tx data Rate (Mbits/sec)", "homeplug_av.nw_info_cnf.sta_indo.phy_dr_tx",
-	  FT_UINT8, BASE_DEC, NULL, 0x00, NULL, HFILL }
+          FT_UINT8, BASE_DEC, NULL, 0x00, NULL, HFILL }
       },
       { &hf_homeplug_av_nw_info_sta_phy_dr_rx,
         { "Average PHY Rx data Rate (Mbits/sec)", "homeplug_av.nw_info_cnf.sta_indo.phy_dr_rx",
-	  FT_UINT8, BASE_DEC, NULL, 0x00, NULL, HFILL }
+          FT_UINT8, BASE_DEC, NULL, 0x00, NULL, HFILL }
       },
       /* Check Points Request */
       { &hf_homeplug_av_cp_rpt_req,
         { "Check Points Request", "homeplug_av.cp_rpt_req",
-	  FT_NONE, BASE_NONE, NULL, 0x00, NULL, HFILL }
+          FT_NONE, BASE_NONE, NULL, 0x00, NULL, HFILL }
       },
       { &hf_homeplug_av_cp_rpt_req_session_id,
         { "Session ID", "homeplug_av.cp_rpt_req.session_id",
-	  FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }
+          FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }
       },
       { &hf_homeplug_av_cp_rpt_req_clr,
         { "Clear flag", "homeplug_av.cp_rpt_req.clr",
-	  FT_UINT8, BASE_HEX, VALS(homeplug_av_rpt_clr_vals), HOMEPLUG_AV_RPT_CLR_MASK, "Unknown", HFILL }
+          FT_UINT8, BASE_HEX, VALS(homeplug_av_rpt_clr_vals), HOMEPLUG_AV_RPT_CLR_MASK, "Unknown", HFILL }
       },
       /* Check Points Confirmation */
       { &hf_homeplug_av_cp_rpt_ind,
         { "Check Points Confirmation", "homeplug_av.cp_rpt_ind",
-	  FT_NONE, BASE_NONE, NULL, 0x00, NULL, HFILL }
+          FT_NONE, BASE_NONE, NULL, 0x00, NULL, HFILL }
       },
       { &hf_homeplug_av_cp_rpt_ind_status,
         { "Status", "homeplug_av.cp_rpt_ind.status",
-	  FT_UINT8, BASE_HEX, VALS(homeplug_av_generic_status_vals), HOMEPLUG_AV_GEN_STATUS_MASK, "Unknown", HFILL }
+          FT_UINT8, BASE_HEX, VALS(homeplug_av_generic_status_vals), HOMEPLUG_AV_GEN_STATUS_MASK, "Unknown", HFILL }
       },
       { &hf_homeplug_av_cp_rpt_ind_major_ver,
         { "Major version", "homeplug_av.cp_rpt_ind.major_ver",
-	  FT_UINT8, BASE_DEC, NULL, 0x00, NULL, HFILL }
+          FT_UINT8, BASE_DEC, NULL, 0x00, NULL, HFILL }
       },
       { &hf_homeplug_av_cp_rpt_ind_minor_ver,
         { "Minor version", "homeplug_av.cp_rpt_ind.minor_ver",
-	  FT_UINT8, BASE_DEC, NULL, 0x00, NULL, HFILL }
+          FT_UINT8, BASE_DEC, NULL, 0x00, NULL, HFILL }
       },
       { &hf_homeplug_av_cp_rpt_ind_session_id,
         { "Session ID", "homeplug_av.cp_rpt_ind.session_id",
-	  FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }
+          FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }
       },
       { &hf_homeplug_av_cp_rpt_ind_total_size,
         { "Total size", "homeplug_av.cp_rpt_ind.total_size",
-	  FT_UINT32, BASE_DEC, NULL, 0x00, NULL, HFILL }
+          FT_UINT32, BASE_DEC, NULL, 0x00, NULL, HFILL }
       },
       { &hf_homeplug_av_cp_rpt_ind_blk_offset,
         { "Offset", "homeplug_av.cp_rpt_ind.blk_offset",
-	  FT_UINT32, BASE_DEC, NULL, 0x00, NULL, HFILL }
+          FT_UINT32, BASE_DEC, NULL, 0x00, NULL, HFILL }
       },
       { &hf_homeplug_av_cp_rpt_ind_byte_index,
         { "Byte Index", "homeplug_av.cp_rpt_ind.byte_index",
-	  FT_UINT32, BASE_DEC, NULL, 0x00, NULL, HFILL }
+          FT_UINT32, BASE_DEC, NULL, 0x00, NULL, HFILL }
       },
       { &hf_homeplug_av_cp_rpt_ind_num_parts,
         { "Number of parts", "homeplug_av.cp_rpt_ind.num_parts",
-	  FT_UINT8, BASE_DEC, NULL, 0x00, NULL, HFILL }
+          FT_UINT8, BASE_DEC, NULL, 0x00, NULL, HFILL }
       },
       { &hf_homeplug_av_cp_rpt_ind_curr_part,
         { "Current part", "homeplug_av.cp_rpt_ind.curr_part",
@@ -3819,359 +3831,359 @@ proto_register_homeplug_av(void)
       },
       { &hf_homeplug_av_cp_rpt_ind_data_len,
         { "Data length", "homeplug_av.cp_rpt_ind.data_len",
-	  FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }
+          FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }
       },
       { &hf_homeplug_av_cp_rpt_ind_data_ofs,
         { "Data offset", "homeplug_av.cp_rpt_ind.data_ofs",
-	  FT_UINT8, BASE_HEX, NULL, 0x00, NULL, HFILL }
+          FT_UINT8, BASE_HEX, NULL, 0x00, NULL, HFILL }
       },
       { &hf_homeplug_av_cp_rpt_ind_data,
         { "Report Data", "homeplug_av.cp_rpt_ind.data",
-	  FT_NONE, BASE_NONE, NULL, 0x00, NULL, HFILL }
+          FT_NONE, BASE_NONE, NULL, 0x00, NULL, HFILL }
       },
       /* Loopback Request */
       { &hf_homeplug_av_fr_lbk_req,
         { "Loopback Request", "homeplug_av.fr_lbk.req",
-	  FT_NONE, BASE_NONE, NULL, 0x00, NULL, HFILL }
+          FT_NONE, BASE_NONE, NULL, 0x00, NULL, HFILL }
       },
       { &hf_homeplug_av_fr_lbk_duration,
         { "Duration", "homeplug_av.lbk.duration",
-	  FT_UINT8, BASE_DEC, NULL, 0x00, NULL, HFILL }
+          FT_UINT8, BASE_DEC, NULL, 0x00, NULL, HFILL }
       },
       { &hf_homeplug_av_fr_lbk_len,
         { "Length", "homeplug_av.lbk.len",
-	  FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }
+          FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }
       },
       { &hf_homeplug_av_fr_lbk_req_data,
         { "Data", "homeplug_av.fr_lbj_req.data",
-	  FT_NONE, BASE_NONE, NULL, 0x00, NULL, HFILL }
+          FT_NONE, BASE_NONE, NULL, 0x00, NULL, HFILL }
       },
       /* Loopback Confirmation */
       { &hf_homeplug_av_fr_lbk_cnf,
         { "Loopback Confirmation", "homeplug_av.fr_lbk_cnf",
-	  FT_NONE, BASE_NONE, NULL, 0x00, NULL, HFILL }
+          FT_NONE, BASE_NONE, NULL, 0x00, NULL, HFILL }
       },
       { &hf_homeplug_av_fr_lbk_cnf_status,
         { "Status", "homeplug_av.fr_lbk_cnf.status",
-	  FT_UINT8, BASE_HEX, VALS(homeplug_av_generic_status_vals), HOMEPLUG_AV_GEN_STATUS_MASK, "Unknown", HFILL }
+          FT_UINT8, BASE_HEX, VALS(homeplug_av_generic_status_vals), HOMEPLUG_AV_GEN_STATUS_MASK, "Unknown", HFILL }
       },
       { &hf_homeplug_av_lbk_stat_cnf,
         { "Loopback Status Confirmation", "homeplug_av.lnk_stat_cnf",
-	  FT_NONE, BASE_NONE, NULL, 0x00, NULL, HFILL }
+          FT_NONE, BASE_NONE, NULL, 0x00, NULL, HFILL }
       },
       { &hf_homeplug_av_lbk_stat_cnf_status,
         { "Status", "homeplug_av.lnk_stat_cnf.status",
-	  FT_UINT8, BASE_HEX, VALS(homeplug_av_generic_status_vals), HOMEPLUG_AV_GEN_STATUS_MASK, NULL, HFILL }
+          FT_UINT8, BASE_HEX, VALS(homeplug_av_generic_status_vals), HOMEPLUG_AV_GEN_STATUS_MASK, NULL, HFILL }
       },
       { &hf_homeplug_av_lbk_stat_cnf_lbk_stat,
         { "Loopback Status", "homeplug_av.lnk_stat_cnf.lbk_stat",
-	  FT_UINT8, BASE_HEX, VALS(homeplug_av_lbk_status_vals), HOMEPLUG_AV_LBK_STATUS_MASK, NULL, HFILL }
+          FT_UINT8, BASE_HEX, VALS(homeplug_av_lbk_status_vals), HOMEPLUG_AV_LBK_STATUS_MASK, NULL, HFILL }
       },
       /* Set Encryption Key Request */
       { &hf_homeplug_av_set_key_req,
         { "Set Encryption Key Request", "homeplug_av.set_key_req",
-	  FT_NONE, BASE_NONE, NULL, 0x00, NULL, HFILL }
+          FT_NONE, BASE_NONE, NULL, 0x00, NULL, HFILL }
       },
       { &hf_homeplug_av_set_key_req_eks,
         { "EKS", "homeplug_av.set_key_req.eks",
-	  FT_UINT8, BASE_HEX, VALS(homeplug_av_set_key_peks_vals), 0x00, "Unknown", HFILL }
+          FT_UINT8, BASE_HEX, VALS(homeplug_av_set_key_peks_vals), 0x00, "Unknown", HFILL }
       },
       { &hf_homeplug_av_set_key_req_nmk,
         { "NMK", "homeplug_av.set_key_req.nmk",
-	  FT_BYTES, BASE_NONE, NULL, 0x00, NULL, HFILL }
+          FT_BYTES, BASE_NONE, NULL, 0x00, NULL, HFILL }
       },
       { &hf_homeplug_av_set_key_req_rda,
         { "Destination Address", "homeplug_av.set_key_req.rda",
-	  FT_ETHER, BASE_NONE, NULL, 0x00, NULL, HFILL }
+          FT_ETHER, BASE_NONE, NULL, 0x00, NULL, HFILL }
       },
       { &hf_homeplug_av_set_key_req_dak,
         { "DAK", "homeplug_av.set_key_req.dak",
-	  FT_BYTES, BASE_NONE, NULL, 0x00, NULL, HFILL }
+          FT_BYTES, BASE_NONE, NULL, 0x00, NULL, HFILL }
       },
       /* Set Encryption Key Confirmation */
       { &hf_homeplug_av_set_key_cnf,
         { "Set Encryption Key Confirmation", "homeplug_av.set_key_cnf",
-	  FT_NONE, BASE_NONE, NULL, 0x00, NULL, HFILL }
+          FT_NONE, BASE_NONE, NULL, 0x00, NULL, HFILL }
       },
       { &hf_homeplug_av_set_key_cnf_status,
         { "Status", "homeplug_av.set_key_cnf.status",
-	  FT_UINT8, BASE_HEX, VALS(homeplug_av_set_key_status_vals), 0x00, NULL, HFILL }
+          FT_UINT8, BASE_HEX, VALS(homeplug_av_set_key_status_vals), 0x00, NULL, HFILL }
       },
       /* Get Manufacturer String Confirmation */
       { &hf_homeplug_av_mfg_string_cnf,
         { "Get Manufacturer String Confirmation", "homeplug_av.mfg_string_cnf",
-	  FT_NONE, BASE_NONE, NULL, 0x00, NULL, HFILL }
+          FT_NONE, BASE_NONE, NULL, 0x00, NULL, HFILL }
       },
       { &hf_homeplug_av_mfg_string_cnf_status,
         { "Status", "homeplug_av.mfg_string_cnf.status",
-	  FT_UINT8, BASE_HEX, VALS(homeplug_av_generic_status_vals), HOMEPLUG_AV_GEN_STATUS_MASK, NULL, HFILL }
+          FT_UINT8, BASE_HEX, VALS(homeplug_av_generic_status_vals), HOMEPLUG_AV_GEN_STATUS_MASK, NULL, HFILL }
       },
       { &hf_homeplug_av_mfg_string_cnf_len,
         { "Length", "homeplug_av.mfg_string_cnf.len",
-	  FT_UINT8, BASE_DEC, NULL, 0x00, NULL, HFILL }
+          FT_UINT8, BASE_DEC, NULL, 0x00, NULL, HFILL }
       },
       { &hf_homeplug_av_mfg_string_cnf_string,
         { "Manufacturing String", "homeplug_av.mfg_string_cnf.string",
-	  FT_STRING, BASE_NONE, NULL, 0x00, NULL, HFILL }
+          FT_STRING, BASE_NONE, NULL, 0x00, NULL, HFILL }
       },
       /* Read Configuration Block Confirmation */
       { &hf_homeplug_av_rd_cblock_cnf,
         { "Read Configuration Block Confirmation", "homeplug_av.rd_block_cnf",
-	  FT_NONE, BASE_NONE, NULL, 0x00, NULL, HFILL }
+          FT_NONE, BASE_NONE, NULL, 0x00, NULL, HFILL }
       },
       { &hf_homeplug_av_rd_cblock_cnf_status,
         { "Status", "homeplug_av.rd_block_cnf.status",
-	  FT_UINT8, BASE_HEX, VALS(homeplug_av_cblock_status_vals), 0x00, NULL, HFILL }
+          FT_UINT8, BASE_HEX, VALS(homeplug_av_cblock_status_vals), 0x00, NULL, HFILL }
       },
       { &hf_homeplug_av_rd_cblock_cnf_len,
         { "Length", "homeplug_av.rd_block_cnf.len",
-	  FT_UINT8, BASE_DEC, NULL, 0x00, NULL, HFILL }
+          FT_UINT8, BASE_DEC, NULL, 0x00, NULL, HFILL }
       },
       /* Configuration Block Header */
       { &hf_homeplug_av_cblock_hdr,
         { "Configuration Block Header", "homeplug_av.cblock_hdr",
-	  FT_NONE, BASE_NONE, NULL, 0x00, NULL, HFILL }
+          FT_NONE, BASE_NONE, NULL, 0x00, NULL, HFILL }
       },
       { &hf_homeplug_av_cblock_hdr_ver,
         { "Header Version Number", "homeplug_av.cblock_hdr.ver",
-	  FT_UINT32, BASE_HEX, NULL, 0x00, NULL, HFILL }
+          FT_UINT32, BASE_HEX, NULL, 0x00, NULL, HFILL }
       },
       { &hf_homeplug_av_cblock_img_rom_addr,
         { "Image address in NVM", "homeplug_av.cblock_hdr.img_rom_addr",
-	  FT_UINT32, BASE_HEX, NULL, 0x00, NULL, HFILL }
+          FT_UINT32, BASE_HEX, NULL, 0x00, NULL, HFILL }
       },
       { &hf_homeplug_av_cblock_img_addr,
         { "Image address in SDRAM", "homeplug_av.cblock_hdr.img_addr",
-	  FT_UINT32, BASE_HEX, NULL, 0x00, NULL, HFILL }
+          FT_UINT32, BASE_HEX, NULL, 0x00, NULL, HFILL }
       },
       { &hf_homeplug_av_cblock_img_len,
         { "Image length", "homeplug_av.cblock_hdr.img_len",
-	  FT_UINT32, BASE_DEC, NULL, 0x00, NULL, HFILL }
+          FT_UINT32, BASE_DEC, NULL, 0x00, NULL, HFILL }
       },
       { &hf_homeplug_av_cblock_img_chksum,
         { "Image Checksum", "homeplug_av.cblock_hdr.img_chksum",
-	  FT_UINT32, BASE_HEX, NULL, 0x00, NULL, HFILL }
+          FT_UINT32, BASE_HEX, NULL, 0x00, NULL, HFILL }
       },
       { &hf_homeplug_av_cblock_entry_point,
         { "Entry Point", "homeplug_av.cblock_hdr.entry_point",
-	  FT_UINT32, BASE_HEX, NULL, 0x00, NULL, HFILL }
+          FT_UINT32, BASE_HEX, NULL, 0x00, NULL, HFILL }
       },
       { &hf_homeplug_av_cblock_next_hdr,
         { "Address of next header in NVM", "homeplug_av.cblock_hdr.next_hdr",
-	  FT_UINT32, BASE_HEX, NULL, 0x00, NULL, HFILL }
+          FT_UINT32, BASE_HEX, NULL, 0x00, NULL, HFILL }
       },
       { &hf_homeplug_av_cblock_hdr_chksum,
         { "Header checksum", "homeplug_av.cblock_hdr.hdr_chksum",
-	  FT_UINT32, BASE_HEX, NULL, 0x00, NULL, HFILL }
+          FT_UINT32, BASE_HEX, NULL, 0x00, NULL, HFILL }
       },
       /* Configuration Block */
       { &hf_homeplug_av_cblock,
         { "Configuration Block", "homeplug_av.cblock",
-	  FT_NONE, BASE_NONE, NULL, 0x00, NULL, HFILL }
+          FT_NONE, BASE_NONE, NULL, 0x00, NULL, HFILL }
       },
       { &hf_homeplug_av_cblock_sdram_size,
         { "SDRAM size", "homeplug_av.cblock.sdram_size",
-	  FT_UINT32, BASE_DEC, NULL, 0x00, NULL, HFILL }
+          FT_UINT32, BASE_DEC, NULL, 0x00, NULL, HFILL }
       },
       { &hf_homeplug_av_cblock_sdram_conf,
         { "SDRAM Configuration Register", "homeplug_av.cblock.sdram_conf",
-	  FT_UINT32, BASE_HEX, NULL, 0x00, NULL, HFILL }
+          FT_UINT32, BASE_HEX, NULL, 0x00, NULL, HFILL }
       },
       { &hf_homeplug_av_cblock_sdram_tim0,
         { "SDRAM Timing Register 0", "homeplug_av.cblock.sdram_tim0",
-	  FT_UINT32, BASE_HEX, NULL, 0x00, NULL, HFILL }
+          FT_UINT32, BASE_HEX, NULL, 0x00, NULL, HFILL }
       },
       { &hf_homeplug_av_cblock_sdram_tim1,
         { "SDRAM Timing Register 1", "homeplug_av.cblock.sdram_tim1",
-	  FT_UINT32, BASE_HEX, NULL, 0x00, NULL, HFILL }
+          FT_UINT32, BASE_HEX, NULL, 0x00, NULL, HFILL }
       },
       { &hf_homeplug_av_cblock_sdram_cntrl,
         { "SDRAM Control Register", "homeplug_av.cblock.sdram_cntrl",
-	  FT_UINT32, BASE_HEX, NULL, 0x00, NULL, HFILL }
+          FT_UINT32, BASE_HEX, NULL, 0x00, NULL, HFILL }
       },
       { &hf_homeplug_av_cblock_sdram_refresh,
         { "SDRAM Refresh Register", "homeplug_av.cblock.sdram_refresh",
-	  FT_UINT32, BASE_HEX, NULL, 0x00, NULL, HFILL }
+          FT_UINT32, BASE_HEX, NULL, 0x00, NULL, HFILL }
       },
       { &hf_homeplug_av_cblock_mac_clock,
         { "MAC Clock Register", "homeplug_av.cblock.mac_clock",
-	  FT_UINT32, BASE_HEX, NULL, 0x00, NULL, HFILL }
+          FT_UINT32, BASE_HEX, NULL, 0x00, NULL, HFILL }
       },
       /* Set SDRAM Configuration Request */
       { &hf_homeplug_av_set_sdram_req,
         { "Set SDRAM Configuration Request", "homeplug_av.set_sdram_req",
-	  FT_NONE, BASE_NONE, NULL, 0x00, NULL, HFILL }
+          FT_NONE, BASE_NONE, NULL, 0x00, NULL, HFILL }
       },
       { &hf_homeplug_av_set_sdram_req_chksum,
         { "Checksum", "homeplug_av.set_sdram_req.chksum",
-	  FT_UINT32, BASE_HEX, NULL, 0x00, NULL, HFILL }
+          FT_UINT32, BASE_HEX, NULL, 0x00, NULL, HFILL }
       },
       /* Set SDRAM Configuration Confirmation */
       { &hf_homeplug_av_set_sdram_cnf,
         { "Set SDRAM Configuration Confirmation", "homeplug_av.set_sdram_cnf",
-	  FT_NONE, BASE_NONE, NULL, 0x00, NULL, HFILL }
+          FT_NONE, BASE_NONE, NULL, 0x00, NULL, HFILL }
       },
       { &hf_homeplug_av_set_sdram_cnf_status,
         { "Status", "homeplug_av.set_sdram_cnf.status",
-	  FT_UINT8, BASE_HEX, VALS(homeplug_av_cblock_status_vals), 0x00, "Unknown", HFILL }
+          FT_UINT8, BASE_HEX, VALS(homeplug_av_cblock_status_vals), 0x00, "Unknown", HFILL }
       },
       /* Embedded Host Action Required Indicate */
       { &hf_homeplug_av_host_action_ind,
         { "Embedded Host Action Required Indicate", "homeplug_av.host_action_ind",
-	  FT_NONE, BASE_NONE, NULL, 0x00, NULL, HFILL }
+          FT_NONE, BASE_NONE, NULL, 0x00, NULL, HFILL }
       },
       { &hf_homeplug_av_host_action_ind_act,
         { "Action required", "homeplug_av.host_action_ind.action",
-	  FT_UINT8, BASE_HEX, VALS(homeplug_av_host_action_vals), 0x00, NULL, HFILL }
+          FT_UINT8, BASE_HEX, VALS(homeplug_av_host_action_vals), 0x00, NULL, HFILL }
       },
       /* Embedded Host Action Required Reponse */
       { &hf_homeplug_av_host_action_rsp,
         { "Embedded Host Action Required Response", "homeplug_av.host_action_rsp",
-	  FT_NONE, BASE_NONE, NULL, 0x00, NULL, HFILL }
+          FT_NONE, BASE_NONE, NULL, 0x00, NULL, HFILL }
       },
       { &hf_homeplug_av_host_action_rsp_sts,
         { "Status", "homeplug_av.host_action_rsp.status",
-	  FT_UINT8, BASE_HEX, VALS(homeplug_av_generic_status_vals), HOMEPLUG_AV_GEN_STATUS_MASK, "Unknown", HFILL }
+          FT_UINT8, BASE_HEX, VALS(homeplug_av_generic_status_vals), HOMEPLUG_AV_GEN_STATUS_MASK, "Unknown", HFILL }
       },
       /* Get Device Attributes Request */
       { &hf_homeplug_av_op_attr_req,
         { "Get Device Attributes Request", "homeplug_av.op_attr_req",
-	  FT_NONE, BASE_NONE, NULL, 0x00, NULL, HFILL }
+          FT_NONE, BASE_NONE, NULL, 0x00, NULL, HFILL }
       },
       { &hf_homeplug_av_op_attr_cookie,
         { "Cookie", "homeplug_av.op_attr.cookie",
-	  FT_UINT32, BASE_DEC, NULL, 0x00, NULL, HFILL }
+          FT_UINT32, BASE_DEC, NULL, 0x00, NULL, HFILL }
       },
       { &hf_homeplug_av_op_attr_rep_type,
         { "Report Type", "homeplug_av.op_attr.rep_type",
-	  FT_UINT8, BASE_HEX, VALS(homeplug_av_op_attr_report_vals), 0x00, NULL, HFILL }
+          FT_UINT8, BASE_HEX, VALS(homeplug_av_op_attr_report_vals), 0x00, NULL, HFILL }
       },
       /* Get Device Attributes Confirmation */
       { &hf_homeplug_av_op_attr_cnf,
         { "Get Device Attributes Confirmation", "homeplug_av.op_attr_cnf",
-	  FT_NONE, BASE_NONE, NULL, 0x00, NULL, HFILL }
+          FT_NONE, BASE_NONE, NULL, 0x00, NULL, HFILL }
       },
       { &hf_homeplug_av_op_attr_cnf_status,
         { "Status", "homeplug_av.op_attr_cnf.status",
-	  FT_UINT16, BASE_HEX, VALS(homeplug_av_generic_status_vals), HOMEPLUG_AV_GEN_STATUS_MASK, NULL, HFILL }
+          FT_UINT16, BASE_HEX, VALS(homeplug_av_generic_status_vals), HOMEPLUG_AV_GEN_STATUS_MASK, NULL, HFILL }
       },
       { &hf_homeplug_av_op_attr_cnf_size,
         { "Size", "homeplug_av.op_attr_cnf.size",
-	  FT_UINT8, BASE_DEC, NULL, 0x00, NULL, HFILL }
+          FT_UINT8, BASE_DEC, NULL, 0x00, NULL, HFILL }
       },
       { &hf_homeplug_av_op_attr_cnf_data,
         { "Data", "homeplug_av.op_attr_cnf.data",
-	  FT_NONE, BASE_NONE, NULL, 0x00, NULL, HFILL }
+          FT_NONE, BASE_NONE, NULL, 0x00, NULL, HFILL }
       },
       /* Device Attributes binary report */
       { &hf_homeplug_av_op_attr_data_hw,
         { "Hardware platform", "homeplug_av.op_attr_cnf.data.hw",
-	  FT_STRING, BASE_NONE, NULL, 0x00, NULL, HFILL }
+          FT_STRING, BASE_NONE, NULL, 0x00, NULL, HFILL }
       },
       { &hf_homeplug_av_op_attr_data_sw,
         { "Software platform", "homeplug_av.op_attr_cnf.data.sw",
-	  FT_STRING, BASE_NONE, NULL, 0x00, NULL, HFILL }
+          FT_STRING, BASE_NONE, NULL, 0x00, NULL, HFILL }
       },
       { &hf_homeplug_av_op_attr_data_sw_major,
         { "Major version", "homeplug_av.op_attr_cnf.data.sw_major",
-	  FT_UINT32, BASE_DEC, NULL, 0x00, NULL, HFILL }
+          FT_UINT32, BASE_DEC, NULL, 0x00, NULL, HFILL }
       },
       { &hf_homeplug_av_op_attr_data_sw_minor,
         { "Minor version", "homeplug_av.op_attr_cnf.data.sw_minor",
-	  FT_UINT32, BASE_DEC, NULL, 0x00, NULL, HFILL }
+          FT_UINT32, BASE_DEC, NULL, 0x00, NULL, HFILL }
       },
       { &hf_homeplug_av_op_attr_data_sw_sub,
         { "Software/PIB version", "homeplug_av.op_attr_cnf.data.sw_sub",
-	  FT_UINT32, BASE_DEC, NULL, 0x00, NULL, HFILL }
+          FT_UINT32, BASE_DEC, NULL, 0x00, NULL, HFILL }
       },
       { &hf_homeplug_av_op_attr_data_sw_num,
         { "Software build number", "homeplug_av.op_attr_cnf.data.sw_sub",
-	  FT_UINT32, BASE_DEC, NULL, 0x00, NULL, HFILL }
+          FT_UINT32, BASE_DEC, NULL, 0x00, NULL, HFILL }
       },
       { &hf_homeplug_av_op_attr_data_sw_date,
         { "Build date", "homeplug_av.op_attr_cnf.data.sw_date",
-	  FT_STRING, BASE_NONE, NULL, 0x00, NULL, HFILL }
+          FT_STRING, BASE_NONE, NULL, 0x00, NULL, HFILL }
       },
       { &hf_homeplug_av_op_attr_data_sw_rel,
         { "Release type", "homeplug_av.op_attr_cnf.data.sw_rel",
-	  FT_STRING, BASE_NONE, NULL, 0x00, NULL, HFILL }
+          FT_STRING, BASE_NONE, NULL, 0x00, NULL, HFILL }
       },
       /* Get Ethernet PHY Settings Request */
       { &hf_homeplug_av_enet_phy_req,
         { "Get Ethernet PHY Settings Request", "homeplug_av.enet_phy_req",
-	  FT_NONE, BASE_NONE, NULL, 0x00, NULL, HFILL }
+          FT_NONE, BASE_NONE, NULL, 0x00, NULL, HFILL }
       },
       { &hf_homeplug_av_enet_phy_req_mcontrol,
         { "Message Control", "homeplug_av.enet_phy_req.mcontrol",
-	  FT_UINT8, BASE_DEC, VALS(homeplug_av_enet_phy_mcontrol_vals), HOMEPLUG_AV_ENET_PHY_MCONTROL_MASK, "Unknown", HFILL }
+          FT_UINT8, BASE_DEC, VALS(homeplug_av_enet_phy_mcontrol_vals), HOMEPLUG_AV_ENET_PHY_MCONTROL_MASK, "Unknown", HFILL }
       },
       { &hf_homeplug_av_enet_phy_req_addcaps,
         { "Advertisement Capabilities", "homeplug_av.enet_phy_req.addcaps",
-	  FT_UINT8, BASE_HEX, NULL, 0x00, NULL, HFILL }
+          FT_UINT8, BASE_HEX, NULL, 0x00, NULL, HFILL }
       },
       /* Get Ethernet PHY Settings Confirmation */
       { &hf_homeplug_av_enet_phy_cnf,
         { "Get Ethernet PHY Settings Confirmation", "homeplug_av.enet_phy_cnf",
-	  FT_NONE, BASE_NONE, NULL, 0x00, NULL, HFILL }
+          FT_NONE, BASE_NONE, NULL, 0x00, NULL, HFILL }
       },
       { &hf_homeplug_av_enet_phy_cnf_status,
         { "Status", "homeplug_av.enet_phy_cnf.status",
-	  FT_UINT8, BASE_DEC, VALS(homeplug_av_generic_status_vals), HOMEPLUG_AV_GEN_STATUS_MASK, NULL, HFILL }
+          FT_UINT8, BASE_DEC, VALS(homeplug_av_generic_status_vals), HOMEPLUG_AV_GEN_STATUS_MASK, NULL, HFILL }
       },
       { &hf_homeplug_av_enet_phy_cnf_speed,
         { "Speed", "homeplug_av.enet_phy.speed",
-	  FT_UINT8, BASE_DEC, VALS(homeplug_av_enet_phy_speed_vals), HOMEPLUG_AV_ENET_PHY_SPEED_MASK, "Unknown", HFILL },
+          FT_UINT8, BASE_DEC, VALS(homeplug_av_enet_phy_speed_vals), HOMEPLUG_AV_ENET_PHY_SPEED_MASK, "Unknown", HFILL },
       },
       { &hf_homeplug_av_enet_phy_cnf_duplex,
         { "Duplex", "homeplug_av.enet_phy.duplex",
-	  FT_UINT8, BASE_DEC, VALS(homeplug_av_enet_phy_duplex_vals), HOMEPLUG_AV_ENET_PHY_DUPLEX_MASK, "Unknown", HFILL },
+          FT_UINT8, BASE_DEC, VALS(homeplug_av_enet_phy_duplex_vals), HOMEPLUG_AV_ENET_PHY_DUPLEX_MASK, "Unknown", HFILL },
       },
       /* Tone Map Characteristics Request */
       { &hf_homeplug_av_tone_map_req,
         { "Tone Map Characteristics Request", "homeplug_av.tone_map_req",
-	  FT_NONE, BASE_NONE, NULL, 0x00, NULL, HFILL }
+          FT_NONE, BASE_NONE, NULL, 0x00, NULL, HFILL }
       },
       { &hf_homeplug_av_tone_map_req_mac,
         { "Peer address", "homeplug_av.tone_map_req.mac",
-	  FT_ETHER, BASE_NONE, NULL, 0x00, NULL, HFILL }
+          FT_ETHER, BASE_NONE, NULL, 0x00, NULL, HFILL }
       },
       { &hf_homeplug_av_tone_map_req_slot,
         { "Tone Map slot", "homeplug_av.tone_map_req.slot",
-	  FT_UINT8, BASE_DEC, NULL, 0x00, NULL, HFILL }
+          FT_UINT8, BASE_DEC, NULL, 0x00, NULL, HFILL }
       },
       /* Tone Map Characteristics Confirmation */
       { &hf_homeplug_av_tone_map_cnf,
         { "Tone Map Characteristics Confirmation", "homeplug_av.tone_map_cnf",
-	  FT_NONE, BASE_NONE, NULL, 0x00, NULL, HFILL }
+          FT_NONE, BASE_NONE, NULL, 0x00, NULL, HFILL }
       },
       { &hf_homeplug_av_tone_map_cnf_status,
         { "Status", "homeplug_av.tone_map_cnf.status",
-	  FT_UINT8, BASE_HEX, VALS(homeplug_av_tone_map_status_vals), HOMEPLUG_AV_TONE_MAP_STATUS_MASK, NULL, HFILL }
+          FT_UINT8, BASE_HEX, VALS(homeplug_av_tone_map_status_vals), HOMEPLUG_AV_TONE_MAP_STATUS_MASK, NULL, HFILL }
       },
       { &hf_homeplug_av_tone_map_cnf_slot,
         { "Slot", "homeplug_av.tone_map_cnf.slot",
-	  FT_UINT8, BASE_DEC, NULL, 0x00, NULL, HFILL }
+          FT_UINT8, BASE_DEC, NULL, 0x00, NULL, HFILL }
       },
       { &hf_homeplug_av_tone_map_cnf_num_tms,
         { "Number of Tone Maps in use", "homeplug_av.tone_map_cnf.num_tms",
-	  FT_UINT8, BASE_DEC, NULL, 0x00, NULL, HFILL }
+          FT_UINT8, BASE_DEC, NULL, 0x00, NULL, HFILL }
       },
       { &hf_homeplug_av_tone_map_cnf_num_act,
         { "Tone map number of active carriers", "homeplug_av.tone_map_cnf.num_act",
-	  FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }
+          FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }
       },
       /* Tone Map Carrier informations */
       { &hf_homeplug_av_tone_map_carrier,
         { "Modulation per carrier", "homeplug_av.tone_map_cnf.carrier",
-	  FT_NONE, BASE_NONE, NULL, 0x00, NULL, HFILL }
+          FT_NONE, BASE_NONE, NULL, 0x00, NULL, HFILL }
       },
       { &hf_homeplug_av_tone_map_carrier_lo,
         { "Modulation (Low carrier)", "homeplug_av.tone_map_cnf.carrier.lo",
-	  FT_UINT8, BASE_HEX, VALS(homeplug_av_tone_map_vals), HOMEPLUG_AV_TONE_MAP_MASK, NULL, HFILL }
+          FT_UINT8, BASE_HEX, VALS(homeplug_av_tone_map_vals), HOMEPLUG_AV_TONE_MAP_MASK, NULL, HFILL }
       },
       { &hf_homeplug_av_tone_map_carrier_hi,
         { "Modulation (High carrier)", "homeplug_av.tone_map_cnf.carrier.hi",
-	  FT_UINT8, BASE_HEX, VALS(homeplug_av_tone_map_vals), HOMEPLUG_AV_TONE_MAP_MASK << 4, NULL, HFILL }
+          FT_UINT8, BASE_HEX, VALS(homeplug_av_tone_map_vals), HOMEPLUG_AV_TONE_MAP_MASK << 4, NULL, HFILL }
       }
    };