| Message ID | 20181115173839.9140-1-blp@ovn.org |
|---|---|
| State | Accepted |
| Headers | show |
| Series | [ovs-dev] pcap: Fix reading regular old Ethernet pcap files. | expand |
On Thu, 15 Nov 2018 09:38:39 -0800 Ben Pfaff <blp@ovn.org> wrote: > This broke the unit tests. > > Fixes: 597177a283da ("pcap-file: Add support for Linux SLL formatted PCAP files.") > Reported-by: Alin Gabriel Serdean <aserdean@ovn.org> > Signed-off-by: Ben Pfaff <blp@ovn.org> > --- Hi, my last nightly Fedora/CentOS tests [1] failed due to 597177a283da ("pcap-file: Add support for Linux SLL formatted PCAP files."). I relaunched the CI with this patch and everything passed. Tested-by: Timothy Redaelli <tredaelli@redhat.com> [1] https://gitlab.com/drizzt/ovs/pipelines/36808576 [2] https://gitlab.com/drizzt/ovs/pipelines/36840304
> -----Mesaj original----- > De la: ovs-dev-bounces@openvswitch.org <ovs-dev- > bounces@openvswitch.org> În numele Ben Pfaff > Trimis: Thursday, November 15, 2018 7:39 PM > Către: dev@openvswitch.org > Cc: Ben Pfaff <blp@ovn.org>; Alin Gabriel Serdean <aserdean@ovn.org> > Subiect: [ovs-dev] [PATCH] pcap: Fix reading regular old Ethernet pcap files. > > This broke the unit tests. > > Fixes: 597177a283da ("pcap-file: Add support for Linux SLL formatted PCAP > files.") > Reported-by: Alin Gabriel Serdean <aserdean@ovn.org> > Signed-off-by: Ben Pfaff <blp@ovn.org> > --- Acked-by: Alin Gabriel Serdean <aserdean@ovn.org> Tested-by: Alin Gabriel Serdean <aserdean@ovn.org>
On Fri, Nov 16, 2018 at 12:42:12PM +0100, Timothy Redaelli wrote: > On Thu, 15 Nov 2018 09:38:39 -0800 > Ben Pfaff <blp@ovn.org> wrote: > > > This broke the unit tests. > > > > Fixes: 597177a283da ("pcap-file: Add support for Linux SLL formatted PCAP files.") > > Reported-by: Alin Gabriel Serdean <aserdean@ovn.org> > > Signed-off-by: Ben Pfaff <blp@ovn.org> > > --- > > Hi, > my last nightly Fedora/CentOS tests [1] failed due to > 597177a283da ("pcap-file: Add support for Linux SLL formatted PCAP > files."). > > I relaunched the CI with this patch and everything passed. > > Tested-by: Timothy Redaelli <tredaelli@redhat.com> Thanks Timothy and Alin. I applied this to master.
diff --git a/lib/pcap-file.c b/lib/pcap-file.c index 0f34c5e83cda..863a9a6c7bf2 100644 --- a/lib/pcap-file.c +++ b/lib/pcap-file.c @@ -40,7 +40,7 @@ enum ts_resolution { }; enum network_type { - PCAP_ETHERNET = 0, + PCAP_ETHERNET = 1, PCAP_LINUX_SLL = 0x71 };
This broke the unit tests. Fixes: 597177a283da ("pcap-file: Add support for Linux SLL formatted PCAP files.") Reported-by: Alin Gabriel Serdean <aserdean@ovn.org> Signed-off-by: Ben Pfaff <blp@ovn.org> --- lib/pcap-file.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)