From patchwork Wed Oct 3 22:39:49 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ben Pfaff X-Patchwork-Id: 978591 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 42QWDg3q0yz9s7T for ; Thu, 4 Oct 2018 08:40:03 +1000 (AEST) Received: from mail.linux-foundation.org (localhost [127.0.0.1]) by mail.linuxfoundation.org (Postfix) with ESMTP id A91D8F01; Wed, 3 Oct 2018 22:40:00 +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 DC03AE7F for ; Wed, 3 Oct 2018 22:39:59 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from relay5-d.mail.gandi.net (relay5-d.mail.gandi.net [217.70.183.197]) by smtp1.linuxfoundation.org (Postfix) with ESMTPS id 4D828A8 for ; Wed, 3 Oct 2018 22:39:57 +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 relay5-d.mail.gandi.net (Postfix) with ESMTPSA id 38B361C0004; Wed, 3 Oct 2018 22:39:53 +0000 (UTC) From: Ben Pfaff To: dev@openvswitch.org Date: Wed, 3 Oct 2018 15:39:49 -0700 Message-Id: <20181003223949.5072-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 , Andre McCurdy Subject: [ovs-dev] [PATCH] netdev-linux: Don't include . 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 header only defines sockaddr_pkt, which this source file doesn't use. This was the only user of net/if_packet.h, so also remove the configure-time test for it (which netdev-linux wasn't using anyway). Reported-by: Andre McCurdy Reported-at: https://github.com/openvswitch/ovs/pull/253 Signed-off-by: Ben Pfaff Acked-by: Justin Pettit --- acinclude.m4 | 11 ----------- configure.ac | 1 - lib/netdev-linux.c | 1 - 3 files changed, 13 deletions(-) diff --git a/acinclude.m4 b/acinclude.m4 index 8d850349817f..ed83df43df54 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -906,17 +906,6 @@ AC_DEFUN([OVS_CHECK_LINUX_COMPAT], [ fi ]) -dnl Checks for net/if_packet.h. -AC_DEFUN([OVS_CHECK_IF_PACKET], - [AC_CHECK_HEADER([net/if_packet.h], - [HAVE_IF_PACKET=yes], - [HAVE_IF_PACKET=no]) - AM_CONDITIONAL([HAVE_IF_PACKET], [test "$HAVE_IF_PACKET" = yes]) - if test "$HAVE_IF_PACKET" = yes; then - AC_DEFINE([HAVE_IF_PACKET], [1], - [Define to 1 if net/if_packet.h is available.]) - fi]) - dnl Checks for net/if_dl.h. dnl dnl (We use this as a proxy for checking whether we're building on FreeBSD diff --git a/configure.ac b/configure.ac index aa92b151a28b..2b3800310231 100644 --- a/configure.ac +++ b/configure.ac @@ -96,7 +96,6 @@ OVS_CHECK_PYTHON OVS_CHECK_FLAKE8 OVS_CHECK_SPHINX OVS_CHECK_DOT -OVS_CHECK_IF_PACKET OVS_CHECK_IF_DL OVS_CHECK_STRTOK_R AC_CHECK_DECLS([sys_siglist], [], [], [[#include ]]) diff --git a/lib/netdev-linux.c b/lib/netdev-linux.c index 3c6eb48ead8c..f86dcd06e563 100644 --- a/lib/netdev-linux.c +++ b/lib/netdev-linux.c @@ -39,7 +39,6 @@ #include #include #include -#include #include #include #include