Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.6 required=3.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4F0E1C3A5A9 for ; Sun, 1 Sep 2019 20:51:34 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 2190A22CE9 for ; Sun, 1 Sep 2019 20:51:34 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=azazel.net header.i=@azazel.net header.b="VIFWjFEq" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729124AbfIAUvd (ORCPT ); Sun, 1 Sep 2019 16:51:33 -0400 Received: from kadath.azazel.net ([81.187.231.250]:53348 "EHLO kadath.azazel.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728941AbfIAUva (ORCPT ); Sun, 1 Sep 2019 16:51:30 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=azazel.net; s=20190108; h=Content-Transfer-Encoding:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To:Content-Type:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive; bh=vkPaDJ+vcHYrLElIERRFK6fNfCzlCuV5J23B8YJ6RZk=; b=VIFWjFEqwdJxdHQZn5kUTQEE/v ULvVyfLzQO3sirgoam/3Y+3NwMop35lf0IVaWT4TKip415izv5W/oitlU/9oxJ7KUMUa4qotReOgG 0FBTOvkZLVm/VOWbvDbDkkQY0qVwCYBecyoy979r8qKMQ/cUPZZfWn9L57GPKj8M10SwGRpMwyKjV POBX1qiHpgdZ9eK/C8pJ9EQtJTJC4gkUS5I/IqQbLH6Y64wLzH1FHH5eDx/C4yiZNwGH+ce+BZpwK Wkby6spBhG7il1NNtbJ4YGleFjdYd+XEA11sK2UfdQ3OQpKR1renFdzEJNnhrX6U5VMLznnHcvU8f X5FkTrAA==; Received: from [2001:8b0:fb7d:d6d7:2e4d:54ff:fe4b:a9ae] (helo=ulthar.dreamlands) by kadath.azazel.net with esmtp (Exim 4.92) (envelope-from ) id 1i4Woo-0002Uf-EO; Sun, 01 Sep 2019 21:51:26 +0100 From: Jeremy Sowden To: Pablo Neira Ayuso , Jozsef Kadlecsik , Florian Westphal Cc: Netfilter Devel Subject: [PATCH nf-next 02/29] netfilter: add include guard to nf_conntrack_labels.h. Date: Sun, 1 Sep 2019 21:50:58 +0100 Message-Id: <20190901205126.6935-3-jeremy@azazel.net> X-Mailer: git-send-email 2.23.0.rc1 In-Reply-To: <20190901205126.6935-1-jeremy@azazel.net> References: <20190901205126.6935-1-jeremy@azazel.net> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SA-Exim-Connect-IP: 2001:8b0:fb7d:d6d7:2e4d:54ff:fe4b:a9ae X-SA-Exim-Mail-From: jeremy@azazel.net X-SA-Exim-Scanned: No (on kadath.azazel.net); SAEximRunCond expanded to false Sender: netfilter-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netfilter-devel@vger.kernel.org nf_conntrack_labels.h has no include guard. Add it. Signed-off-by: Jeremy Sowden --- include/net/netfilter/nf_conntrack_labels.h | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/include/net/netfilter/nf_conntrack_labels.h b/include/net/netfilter/nf_conntrack_labels.h index 4eacce6f3bcc..ba916411c4e1 100644 --- a/include/net/netfilter/nf_conntrack_labels.h +++ b/include/net/netfilter/nf_conntrack_labels.h @@ -1,11 +1,14 @@ /* SPDX-License-Identifier: GPL-2.0 */ -#include -#include + +#ifndef _NF_CONNTRACK_LABELS_H +#define _NF_CONNTRACK_LABELS_H + #include #include +#include +#include #include #include - #include #define NF_CT_LABELS_MAX_SIZE ((XT_CONNLABEL_MAXBIT + 1) / BITS_PER_BYTE) @@ -51,3 +54,5 @@ static inline void nf_conntrack_labels_fini(void) {} static inline int nf_connlabels_get(struct net *net, unsigned int bit) { return 0; } static inline void nf_connlabels_put(struct net *net) {} #endif + +#endif /* _NF_CONNTRACK_LABELS_H */ -- 2.23.0.rc1