From: Guy Harris <guy@alum.mit.edu>
Date: Sun, 19 Aug 2012 03:16:11 +0000 (-0700)
Subject: Updates for the VLAN tag fix.
X-Git-Url: https://git.tcpdump.org/libpcap/commitdiff_plain/7a154a36bf57be2d08d4d30d6bb28ea76928f78e?ds=sidebyside

Updates for the VLAN tag fix.

Add it to the list for a (future) 1.3.1 release, and add Jakub Zawadzki
to the credits (he also did the nflog/netfilter/nfqueue support).
---

diff --git a/CHANGES b/CHANGES
index 1a9c77b4..6627c4a5 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,4 @@
-Saturday June 30, 2012 guy@alum.mit.edu
+Saturday August 18, 2012 guy@alum.mit.edu
 Summary for 1.3.1 libpcap release
 	Fix pcap-config to include -lpthread if canusb support is
 	    present
@@ -12,6 +12,7 @@ Summary for 1.3.1 libpcap release
 	    that instead)
 	Catch attempts to call pcap_compile() on a non-activated pcap_t
 	Fix crash on Linux with CAN-USB support without usbfs
+	Fix addition of VLAN tags for Linux cooked captures
 
 Friday  March 30, 2012.  mcr@sandelman.ca
 Summary for 1.3.0 libpcap release
diff --git a/CREDITS b/CREDITS
index cfe84ba4..329f1ca9 100644
--- a/CREDITS
+++ b/CREDITS
@@ -59,6 +59,7 @@ Additional people who have contributed patches:
     Henri Doreau                  <hdoreau at sourceforge dot net>
     Hyung Sik Yoon                <hsyn at kr dot ibm dot com>
     Igor Khristophorov            <igor at atdot dot org>
+    Jakub Zawadzki                <darkjames at darkjames dot pl>
     Jan-Philip Velders            <jpv at veldersjes dot net>
     Jason R. Thorpe               <thorpej at netbsd dot org>
     Javier Achirica               <achirica at ttd dot net>