diff options
| author | Evan Huus <eapache@gmail.com> | 2012-10-26 00:42:34 +0000 |
|---|---|---|
| committer | Evan Huus <eapache@gmail.com> | 2012-10-26 00:42:34 +0000 |
| commit | c6b522bc703bd91b5c473491a68e92b5319e819c (patch) | |
| tree | 531fb34d8bbdba3d2a27de3c5e457243f6fa2fd7 /epan/column-utils.c | |
| parent | d97b4ec325830bee235568138ba4151edc253c54 (diff) | |
Revert revision 44921.
See discussion on https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7728
svn path=/trunk/; revision=45791
Diffstat (limited to 'epan/column-utils.c')
| -rw-r--r-- | epan/column-utils.c | 21 |
1 files changed, 5 insertions, 16 deletions
diff --git a/epan/column-utils.c b/epan/column-utils.c index 5486050a8a..3fe7d16e4b 100644 --- a/epan/column-utils.c +++ b/epan/column-utils.c @@ -1441,22 +1441,11 @@ col_set_addr(packet_info *pinfo, const int col, const address *addr, const gbool break; case AT_ETHER: - switch(addr->subtype) { - default: - if (is_src) - pinfo->cinfo->col_expr.col_expr[col] = "eth.src"; - else - pinfo->cinfo->col_expr.col_expr[col] = "eth.dst"; - address_to_str_buf(addr, pinfo->cinfo->col_expr.col_expr_val[col], COL_MAX_LEN); - break; - case AT_SUB_IEEE80211: - if (is_src) - pinfo->cinfo->col_expr.col_expr[col] = "wlan.sa"; - else - pinfo->cinfo->col_expr.col_expr[col] = "wlan.da"; - address_to_str_buf(addr, pinfo->cinfo->col_expr.col_expr_val[col], COL_MAX_LEN); - break; - } + if (is_src) + pinfo->cinfo->col_expr.col_expr[col] = "eth.src"; + else + pinfo->cinfo->col_expr.col_expr[col] = "eth.dst"; + address_to_str_buf(addr, pinfo->cinfo->col_expr.col_expr_val[col], COL_MAX_LEN); break; case AT_IPv4: |