From patchwork Thu Nov 15 17:38:39 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ben Pfaff X-Patchwork-Id: 998474 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=openvswitch.org (client-ip=140.211.169.12; helo=mail.linuxfoundation.org; envelope-from=ovs-dev-bounces@openvswitch.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=ovn.org Received: from mail.linuxfoundation.org (mail.linuxfoundation.org [140.211.169.12]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 42wpXZ54kSz9s3q for ; Fri, 16 Nov 2018 04:39:58 +1100 (AEDT) Received: from mail.linux-foundation.org (localhost [127.0.0.1]) by mail.linuxfoundation.org (Postfix) with ESMTP id B8442E04; Thu, 15 Nov 2018 17:38:52 +0000 (UTC) X-Original-To: dev@openvswitch.org Delivered-To: ovs-dev@mail.linuxfoundation.org Received: from smtp1.linuxfoundation.org (smtp1.linux-foundation.org [172.17.192.35]) by mail.linuxfoundation.org (Postfix) with ESMTPS id A0AE6CD1 for ; Thu, 15 Nov 2018 17:38:51 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from relay6-d.mail.gandi.net (relay6-d.mail.gandi.net [217.70.183.198]) by smtp1.linuxfoundation.org (Postfix) with ESMTPS id 0726C7E3 for ; Thu, 15 Nov 2018 17:38:50 +0000 (UTC) X-Originating-IP: 208.91.3.26 Received: from sigabrt.benpfaff.org (unknown [208.91.3.26]) (Authenticated sender: blp@ovn.org) by relay6-d.mail.gandi.net (Postfix) with ESMTPSA id EF7C2C0005; Thu, 15 Nov 2018 17:38:47 +0000 (UTC) From: Ben Pfaff To: dev@openvswitch.org Date: Thu, 15 Nov 2018 09:38:39 -0800 Message-Id: <20181115173839.9140-1-blp@ovn.org> X-Mailer: git-send-email 2.16.1 X-Spam-Status: No, score=-2.6 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_LOW autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on smtp1.linux-foundation.org Cc: Ben Pfaff , Alin Gabriel Serdean Subject: [ovs-dev] [PATCH] pcap: Fix reading regular old Ethernet pcap files. X-BeenThere: ovs-dev@openvswitch.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: ovs-dev-bounces@openvswitch.org Errors-To: ovs-dev-bounces@openvswitch.org This broke the unit tests. Fixes: 597177a283da ("pcap-file: Add support for Linux SLL formatted PCAP files.") Reported-by: Alin Gabriel Serdean Signed-off-by: Ben Pfaff Tested-by: Timothy Redaelli Acked-by: Alin Gabriel Serdean Tested-by: Alin Gabriel Serdean --- lib/pcap-file.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 };