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/address.h | |
| parent | d97b4ec325830bee235568138ba4151edc253c54 (diff) | |
| download | wireshark-c6b522bc703bd91b5c473491a68e92b5319e819c.tar.gz wireshark-c6b522bc703bd91b5c473491a68e92b5319e819c.tar.bz2 wireshark-c6b522bc703bd91b5c473491a68e92b5319e819c.zip | |
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/address.h')
| -rw-r--r-- | epan/address.h | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/epan/address.h b/epan/address.h index 0764777591..24e0001370 100644 --- a/epan/address.h +++ b/epan/address.h @@ -62,28 +62,14 @@ typedef enum { /* (the long addresses are EUI-64's */ } address_type; -typedef enum { - AT_SUB_NONE, /* no sub type */ - AT_SUB_IEEE80211 /* 802.11 */ -} address_stype; - typedef struct _address { address_type type; /* type of address */ - address_stype subtype; int len; /* length of address, in bytes */ const void *data; /* pointer to address data */ } address; #define SET_ADDRESS(addr, addr_type, addr_len, addr_data) { \ (addr)->type = (addr_type); \ - (addr)->subtype = AT_SUB_NONE; \ - (addr)->len = (addr_len); \ - (addr)->data = (addr_data); \ - } - -#define SET_ADDRESS_SUB(addr, addr_type, addr_subtype, addr_len, addr_data) { \ - (addr)->type = (addr_type); \ - (addr)->subtype = addr_subtype; \ (addr)->len = (addr_len); \ (addr)->data = (addr_data); \ } |