fix for netmon 3.x captures

metze

diff --git a/wiretap/netmon.c b/wiretap/netmon.c
index 717992a738c449963dba91ef5c7bd5ba3279d98d..e6958c90ee1883359c98c36e22f516eb92a5af46 100644 (file)
--- a/wiretap/netmon.c
+++ b/wiretap/netmon.c
@@ -264,13 +264,14 @@ int netmon_open(wtap *wth, int *err, gchar **err_info)
        wth->subtype_read = netmon_read;
        wth->subtype_seek_read = netmon_seek_read;
        wth->subtype_sequential_close = netmon_sequential_close;
-
+#if 0
        /* NetMon capture file formats v2.1+ use per-packet encapsulation types.  NetMon 3 sets the value in
         * the header to 1 (Ethernet) for backwards compability. */
        if((hdr.ver_major == 2 && hdr.ver_minor >= 1) || hdr.ver_major > 2)
                wth->file_encap = WTAP_ENCAP_PER_PACKET;
        else
-               wth->file_encap = netmon_encap[hdr.network];
+#endif
+       wth->file_encap = netmon_encap[hdr.network];
 
        wth->snapshot_length = 0;       /* not available in header */
        /*