Merge branch 'master' of git+ssh://bpf.tcpdump.org/tcpdump/master/git/tcpdump

diff --combined Makefile.in
index d71b3633d74cefbb1af30f4a3a77cba9859e8d2f,dadd3a3c9b728a57bb0b7d1e8bece3a3bf301388..ba6a97d42c960dd5afe0007017f36b9962fc2bbd
--- 1/Makefile.in
--- 2/Makefile.in
+++ b/Makefile.in
@@@ -46,7 -46,8 +46,8 @@@ INCLS = -I. @V_INCLS
  DEFS = @DEFS@ @CPPFLAGS@ @V_DEFS@
  
  # Standard CFLAGS
- CFLAGS = $(CCOPT) $(DEFS) $(INCLS)
+ CFLAGS = @CFLAGS@
+ FULL_CFLAGS = $(CCOPT) $(DEFS) $(INCLS) $(CFLAGS)
  
  # Standard LDFLAGS
  LDFLAGS = @LDFLAGS@
@@@ -64,15 -65,15 +65,15 @@@ RANLIB = @RANLIB
  # problem if you don't own the file but can write to the directory.
  .c.o:
        @rm -f $@
-       $(CC) $(CFLAGS) -c $(srcdir)/$*.c
+       $(CC) $(FULL_CFLAGS) -c $(srcdir)/$*.c
  
  CSRC =        addrtoname.c af.c checksum.c cpack.c gmpls.c oui.c gmt2local.c ipproto.c \
          nlpid.c l2vpn.c machdep.c parsenfsfh.c \
 -      print-802_11.c print-ap1394.c print-ah.c print-arcnet.c \
 -      print-aodv.c print-arp.c print-ascii.c print-atalk.c print-atm.c \
 -      print-beep.c print-bfd.c print-bgp.c print-bootp.c print-bt.c \
 -      print-cdp.c print-cfm.c print-chdlc.c print-cip.c print-cnfp.c \
 -      print-dccp.c print-decnet.c \
 +      print-802_11.c print-802_15_4.c print-ap1394.c print-ah.c \
 +      print-arcnet.c print-aodv.c print-arp.c print-ascii.c print-atalk.c \
 +      print-atm.c print-beep.c print-bfd.c print-bgp.c print-bootp.c \
 +      print-bt.c print-cdp.c print-cfm.c print-chdlc.c print-cip.c \
 +      print-cnfp.c print-dccp.c print-decnet.c \
        print-domain.c print-dtp.c print-dvmrp.c print-enc.c print-egp.c \
        print-eap.c print-eigrp.c\
        print-esp.c print-ether.c print-fddi.c print-fr.c \
@@@ -356,7 -357,7 +357,7 @@@ all: $(PROG
  
  $(PROG): $(OBJ) @V_PCAPDEP@
        @rm -f $@
-       $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(OBJ) $(LIBS)
+       $(CC) $(FULL_CFLAGS) $(LDFLAGS) -o $@ $(OBJ) $(LIBS)
  
  $(LIBNETDISSECT): $(LIBNETDISSECT_OBJ)
        @rm -f $@
@@@ -364,30 -365,30 +365,30 @@@
        $(RANLIB) $@
  
  datalinks.o: $(srcdir)/missing/datalinks.c
-       $(CC) $(CFLAGS) -o $@ -c $(srcdir)/missing/datalinks.c
+       $(CC) $(FULL_CFLAGS) -o $@ -c $(srcdir)/missing/datalinks.c
  dlnames.o: $(srcdir)/missing/dlnames.c
-       $(CC) $(CFLAGS) -o $@ -c $(srcdir)/missing/dlnames.c
+       $(CC) $(FULL_CFLAGS) -o $@ -c $(srcdir)/missing/dlnames.c
  getnameinfo.o: $(srcdir)/missing/getnameinfo.c
-       $(CC) $(CFLAGS) -o $@ -c $(srcdir)/missing/getnameinfo.c
+       $(CC) $(FULL_CFLAGS) -o $@ -c $(srcdir)/missing/getnameinfo.c
  getaddrinfo.o: $(srcdir)/missing/getaddrinfo.c
-       $(CC) $(CFLAGS) -o $@ -c $(srcdir)/missing/getaddrinfo.c
+       $(CC) $(FULL_CFLAGS) -o $@ -c $(srcdir)/missing/getaddrinfo.c
  inet_pton.o: $(srcdir)/missing/inet_pton.c
-       $(CC) $(CFLAGS) -o $@ -c $(srcdir)/missing/inet_pton.c
+       $(CC) $(FULL_CFLAGS) -o $@ -c $(srcdir)/missing/inet_pton.c
  inet_ntop.o: $(srcdir)/missing/inet_ntop.c
-       $(CC) $(CFLAGS) -o $@ -c $(srcdir)/missing/inet_ntop.c
+       $(CC) $(FULL_CFLAGS) -o $@ -c $(srcdir)/missing/inet_ntop.c
  inet_aton.o: $(srcdir)/missing/inet_aton.c
-       $(CC) $(CFLAGS) -o $@ -c $(srcdir)/missing/inet_aton.c
+       $(CC) $(FULL_CFLAGS) -o $@ -c $(srcdir)/missing/inet_aton.c
  snprintf.o: $(srcdir)/missing/snprintf.c
-       $(CC) $(CFLAGS) -o $@ -c $(srcdir)/missing/snprintf.c
+       $(CC) $(FULL_CFLAGS) -o $@ -c $(srcdir)/missing/snprintf.c
  strlcat.o: $(srcdir)/missing/strlcat.c
-       $(CC) $(CFLAGS) -o $@ -c $(srcdir)/missing/strlcat.c
+       $(CC) $(FULL_CFLAGS) -o $@ -c $(srcdir)/missing/strlcat.c
  strlcpy.o: $(srcdir)/missing/strlcpy.c
-       $(CC) $(CFLAGS) -o $@ -c $(srcdir)/missing/strlcpy.c
+       $(CC) $(FULL_CFLAGS) -o $@ -c $(srcdir)/missing/strlcpy.c
  strsep.o: $(srcdir)/missing/strsep.c
-       $(CC) $(CFLAGS) -o $@ -c $(srcdir)/missing/strsep.c
+       $(CC) $(FULL_CFLAGS) -o $@ -c $(srcdir)/missing/strsep.c
  
  version.o: version.c
-       $(CC) $(CFLAGS) -c version.c
+       $(CC) $(FULL_CFLAGS) -c version.c
  
  version.c: $(srcdir)/VERSION
        @rm -f $@

diff --combined tcpdump.c
index da88d3837120501d8284ed2b1b446dddcc1ef93a,65746d8f2df30da186244f3c60e926c1449e4bfb..a051e4d4f8150ca348e22f9499e7456265a6fd38
--- 1/tcpdump.c
--- 2/tcpdump.c
+++ b/tcpdump.c
@@@ -305,9 -305,6 +305,9 @@@ static struct printer printers[] = 
  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 },
  };
@@@ -403,7 -400,7 +403,7 @@@ show_dlts_and_exit(const char *device, 
                        if (lookup_printer(dlts[n_dlts]) == NULL
                              && lookup_ndo_printer(dlts[n_dlts]) == NULL)
                                (void) fprintf(stderr, " (printing not supported)");
-                       putchar('\n');
+                       fprintf(stderr, "\n");
                } else {
                        (void) fprintf(stderr, "  DLT %d (printing not supported)\n",
                            dlts[n_dlts]);