Don't use pcap LINKTYPE_ values in the iface_options structure, use

Wiretap encapsulation values; rename the field in question encap_type to
emphasize that.  (Code that looks at that field already assumes it's a
Wiretap encapsulation value.)

For live captures, map the LINKTYPE_ value to a Wiretap encapsulation
value.

wtap_encap_string() never returns NULL, so don't check for a null return
value.

svn path=/trunk/; revision=42871

1 files changed, 1 insertions, 1 deletions

diff --git a/summary.h b/summary.h
index a26704b921..21df0c0de8 100644
--- a/summary.h
+++ b/summary.h
@@ -38,7 +38,7 @@ typedef struct iface_options_tag {
     gboolean drops_known;    /**< TRUE if number of packet drops is known */
     gboolean has_snap;       /**< TRUE if maximum capture packet length is known */
     int      snap;           /**< Maximum captured packet length */
-    int      linktype;       /**< wiretap encapsulation type */
+    int      encap_type;     /**< wiretap encapsulation type */
 } iface_options;
 
 typedef struct _summary_tally {