diff options
| author | Guy Harris <guy@alum.mit.edu> | 2016-02-18 18:33:53 -0800 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2016-02-19 02:34:50 +0000 |
| commit | 1e8905ca8e1db9231bc5381887850aa3eca7f735 (patch) | |
| tree | b445b379bc601311a64d4453bfc54be10e05aad9 /wiretap/pcap-common.c | |
| parent | 7a5c04e243ff13b43618f8385f52c2186f753870 (diff) | |
Don't bother setting phdr->pkt_encap to wth->file_encap.
wtap_read() and wtap_seek_read() now do so before calling the read or
seek-read routine, so there's no need to do so in those routines.
Rename hcidump_process_packet() to hcidump_read_packet() while we're at
it, as it doesn't just process an already-read packet, it does the
reading as well as the processing.
Change-Id: Ic13da6a2096e68550d80f2eff31f03d0edb58147
Reviewed-on: https://code.wireshark.org/review/13998
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Diffstat (limited to 'wiretap/pcap-common.c')
| -rw-r--r-- | wiretap/pcap-common.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/wiretap/pcap-common.c b/wiretap/pcap-common.c index 76f74ce4d2..470ec39ceb 100644 --- a/wiretap/pcap-common.c +++ b/wiretap/pcap-common.c @@ -1540,8 +1540,6 @@ pcap_process_pseudo_header(FILE_T fh, int file_type, int wtap_encap, int phdr_len = 0; guint size; - phdr->pkt_encap = wtap_encap; - switch (wtap_encap) { case WTAP_ENCAP_ATM_PDUS: |