COL_BSSGP_TLLI is deprecated

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@29721 f5534014-38df-0310-8fa8-9805f1628bb7

diff --git a/epan/column-utils.c b/epan/column-utils.c
index 66c6dee59c5b7468999591998786737fedfe0046..b0a8f3192f32a0079ed130dc1ab0a7561becb65d 100644 (file)
--- a/epan/column-utils.c
+++ b/epan/column-utils.c
@@ -1650,9 +1650,6 @@ col_fill_in(packet_info *pinfo, gboolean fill_fd_colums)
     case COL_8021Q_VLAN_ID: /* done by packet-nstrace.c and packet-vlan.c */
         break;
 
-    case COL_BSSGP_TLLI: /* done by packet-bssgp.c */
-        break;
-
     case COL_EXPERT:    /* done by expert.c */
         break;
 

diff --git a/epan/prefs.c b/epan/prefs.c
index ceb51aad789e45762d31a5bfa5fab42803d18b05..1ece7f083335f3b398fcee604c90005ca17a8a8d 100644 (file)
--- a/epan/prefs.c
+++ b/epan/prefs.c
@@ -1754,7 +1754,7 @@ try_convert_to_custom_column(gpointer *el_data)
     } migrated_columns[] = {
         { COL_COS_VALUE, "vlan.priority" },
         { COL_CIRCUIT_ID, "iax2.call" },
-               { COL_BSSGP_TLLI, "bssgp.tlli" },
+        { COL_BSSGP_TLLI, "bssgp.tlli" },
         { COL_HPUX_SUBSYS, "nettl.subsys" },
         { COL_HPUX_DEVID, "nettl.devid" },
         { COL_DSCP_VALUE, "ip.dsfield" },