Merge remote branch 'origin/master'

diff --cc Makefile.in
Simple merge

diff --cc interface.h
Simple merge

diff --cc tcpdump.c
index 666150387364c2047c9f6bc6770343e4fcb9390c,06683af344a483ff5c9874d546e7aea165654afa..da88d3837120501d8284ed2b1b446dddcc1ef93a
--- 1/tcpdump.c
--- 2/tcpdump.c
+++ b/tcpdump.c
@@@ -259,31 -268,43 +268,46 @@@ static struct printer printers[] = 
        { juniper_services_print, DLT_JUNIPER_SERVICES },
  #endif
  #ifdef DLT_JUNIPER_ETHER
-       { juniper_ether_print, DLT_JUNIPER_ETHER },
+       { juniper_ether_print,  DLT_JUNIPER_ETHER },
  #endif
  #ifdef DLT_JUNIPER_PPP
-       { juniper_ppp_print, DLT_JUNIPER_PPP },
+       { juniper_ppp_print,    DLT_JUNIPER_PPP },
  #endif
  #ifdef DLT_JUNIPER_FRELAY
-       { juniper_frelay_print, DLT_JUNIPER_FRELAY },
+       { juniper_frelay_print, DLT_JUNIPER_FRELAY },
  #endif
  #ifdef DLT_JUNIPER_CHDLC
-       { juniper_chdlc_print, DLT_JUNIPER_CHDLC },
+       { juniper_chdlc_print,  DLT_JUNIPER_CHDLC },
  #endif
  #ifdef DLT_MFR
-       { mfr_if_print, DLT_MFR },
+       { mfr_if_print,         DLT_MFR },
  #endif
  #if defined(DLT_BLUETOOTH_HCI_H4_WITH_PHDR) && defined(HAVE_PCAP_BLUETOOTH_H)
-       { bt_if_print, DLT_BLUETOOTH_HCI_H4_WITH_PHDR},
+       { bt_if_print,          DLT_BLUETOOTH_HCI_H4_WITH_PHDR},
+ #endif
+ #ifdef HAVE_PCAP_USB_H
+ #ifdef DLT_USB_LINUX
+       { usb_linux_48_byte_print, DLT_USB_LINUX},
+ #endif /* DLT_USB_LINUX */
+ #ifdef DLT_USB_LINUX_MMAPPED
+       { usb_linux_64_byte_print, DLT_USB_LINUX_MMAPPED},
+ #endif /* DLT_USB_LINUX_MMAPPED */
+ #endif /* HAVE_PCAP_USB_H */
+ #ifdef DLT_IPV4
+       { raw_if_print,         DLT_IPV4 },
+ #endif
+ #ifdef DLT_IPV6
+       { raw_if_print,         DLT_IPV6 },
  #endif
- #if defined(HAVE_PCAP_USB_H) && defined(DLT_USB_LINUX)
-       { usb_linux_print, DLT_USB_LINUX},
- #endif
- #if defined(HAVE_PCAP_USB_H) && defined(DLT_USB_LINUX_MMAPPED)
-       { usb_linux_print, DLT_USB_LINUX_MMAPPED},
+       { NULL,                 0 },
+ };
+ 
+ static struct ndo_printer ndo_printers[] = {
+ #ifdef DLT_IPNET
+       { ipnet_if_print,       DLT_IPNET },
 +#endif
 +#ifdef DLT_IEEE802_15_4
 +      { ieee802_15_4_if_print, DLT_IEEE802_15_4 },
  #endif
        { NULL,                 0 },
  };