diff options
| author | Anders Broman <anders.broman@ericsson.com> | 2012-03-06 09:02:06 +0000 |
|---|---|---|
| committer | Anders Broman <anders.broman@ericsson.com> | 2012-03-06 09:02:06 +0000 |
| commit | 7fba54762bbd8b18aab65253071a0f375c626011 (patch) | |
| tree | d5e66878eeb782fa468ec97e8040e1f23f5a4384 /wiretap/wtap.c | |
| parent | 3b06ee6ca07223fe7594bfec7031a26d6219be0e (diff) | |
| download | wireshark-7fba54762bbd8b18aab65253071a0f375c626011.tar.gz | |
From Mike Wakerly: Add wiretap suport for LINKTYPE_NFC_LLCP
svn path=/trunk/; revision=41368
Diffstat (limited to 'wiretap/wtap.c')
| -rw-r--r-- | wiretap/wtap.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/wiretap/wtap.c b/wiretap/wtap.c index 3def7c5c47..f1f8212ccd 100644 --- a/wiretap/wtap.c +++ b/wiretap/wtap.c @@ -558,7 +558,10 @@ static struct encap_type_info encap_table_base[] = { { "ISO/IEC 13818-1 MPEG2-TS", "mp2ts" }, /* WTAP_ENCAP_PPP_ETHER */ - { "PPP-over-Ethernet session", "pppoes" } + { "PPP-over-Ethernet session", "pppoes" }, + + /* WTAP_ENCAP_NFC_LLCP */ + { "LLCP", "llcp" } }; gint wtap_num_encap_types = sizeof(encap_table_base) / sizeof(struct encap_type_info); |