diff options
| -rw-r--r-- | epan/column.c | 2 | ||||
| -rw-r--r-- | epan/column_info.h | 2 | ||||
| -rw-r--r-- | epan/prefs.c | 1 | ||||
| -rw-r--r-- | gtk/new_packet_list.c | 1 |
4 files changed, 3 insertions, 3 deletions
diff --git a/epan/column.c b/epan/column.c index f64759b7cf..137ea8396a 100644 --- a/epan/column.c +++ b/epan/column.c @@ -73,7 +73,7 @@ col_format_to_string(gint fmt) { "%XR", /* 23) COL_RXID */ "%C", /* 24) !! DEPRECATED !! - COL_FR_DLCI */ "%F", /* 25) COL_FREQ_CHAN */ - "%l", /* 26) COL_BSSGP_TLLI */ + "%l", /* 26) !! DEPRECATED !! - COL_BSSGP_TLLI */ "%P", /* 27) !! DEPRECATED !! - COL_HPUX_DEVID */ "%H", /* 28) !! DEPRECATED !! - COL_HPUX_SUBSYS */ "%hd", /* 29) COL_DEF_DL_DST */ diff --git a/epan/column_info.h b/epan/column_info.h index ebca2deb00..f5c796e9f5 100644 --- a/epan/column_info.h +++ b/epan/column_info.h @@ -92,7 +92,7 @@ enum { COL_RXID, /* 23) Fibre Channel RXID */ COL_FR_DLCI, /* 24) !! DEPRECATED !! - Frame Relay DLCI */ COL_FREQ_CHAN, /* 25) IEEE 802.11 (and WiMax?) - Channel */ - COL_BSSGP_TLLI, /* 26) GPRS BSSGP IE TLLI */ + COL_BSSGP_TLLI, /* 26) !! DEPRECATED !! - GPRS BSSGP IE TLLI */ COL_HPUX_DEVID, /* 27) !! DEPRECATED !! - HP-UX Nettl Device ID */ COL_HPUX_SUBSYS, /* 28) !! DEPRECATED !! - HP-UX Nettl Subsystem */ COL_DEF_DL_DST, /* 29) Data link layer dest address */ diff --git a/epan/prefs.c b/epan/prefs.c index 4235c03abd..b80ac4989a 100644 --- a/epan/prefs.c +++ b/epan/prefs.c @@ -1753,6 +1753,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_HPUX_SUBSYS, "nettl.subsys" }, { COL_HPUX_DEVID, "nettl.devid" }, { COL_DSCP_VALUE, "ip.dsfield" }, diff --git a/gtk/new_packet_list.c b/gtk/new_packet_list.c index bd431945a1..955eb4385e 100644 --- a/gtk/new_packet_list.c +++ b/gtk/new_packet_list.c @@ -181,7 +181,6 @@ new_packet_list_append(column_info *cinfo, frame_data *fdata, packet_info *pinfo case COL_DCE_CALL: /* 9) DCE/RPC connection oriented call id OR datagram sequence number */ case COL_DCE_CTX: /* 10) DCE/RPC connection oriented context id */ case COL_8021Q_VLAN_ID: /* 0) 802.1Q vlan ID */ - case COL_BSSGP_TLLI: /* 26) GPRS BSSGP IE TLLI */ case COL_FREQ_CHAN: /* 25) IEEE 802.11 (and WiMax?) - Channel */ /* These too ? */ case COL_RSSI: /* 35) IEEE 802.11 - received signal strength */ |