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 1a9c77b4934e1d21a6d2974440ac8bda55c66425..6627c4a53a8a63074b68ad5fce2375bd2e97a043 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,4 @@
-Saturday June 30, 2012 [email protected]
+Saturday August 18, 2012 [email protected]

 Summary for 1.3.1 libpcap release
        Fix pcap-config to include -lpthread if canusb support is
            present
 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
            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.  [email protected]
 Summary for 1.3.0 libpcap release
 
 Friday  March 30, 2012.  [email protected]
 Summary for 1.3.0 libpcap release

diff --git a/CREDITS b/CREDITS
index cfe84ba4e9fc6b67d942ab36ea259d0b0a110c6c..329f1ca98eedef52efabd66bd67cd64805b063b4 100644 (file)
--- 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>
     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>
     Jan-Philip Velders            <jpv at veldersjes dot net>
     Jason R. Thorpe               <thorpej at netbsd dot org>
     Javier Achirica               <achirica at ttd dot net>