Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

netfilter: fix include guards.

nf_conntrack_labels.h has no include guard. Add it.

The comment following the #endif in the nf_flow_table.h include guard
referred to the wrong macro. Fix it.

Signed-off-by: Jeremy Sowden <jeremy@azazel.net>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>

authored by

Jeremy Sowden and committed by
Pablo Neira Ayuso
0286fbc6 06d392cb

+9 -4
+8 -3
include/net/netfilter/nf_conntrack_labels.h
··· 1 1 /* SPDX-License-Identifier: GPL-2.0 */ 2 - #include <linux/types.h> 3 - #include <net/net_namespace.h> 2 + 3 + #ifndef _NF_CONNTRACK_LABELS_H 4 + #define _NF_CONNTRACK_LABELS_H 5 + 4 6 #include <linux/netfilter/nf_conntrack_common.h> 5 7 #include <linux/netfilter/nf_conntrack_tuple_common.h> 8 + #include <linux/types.h> 9 + #include <net/net_namespace.h> 6 10 #include <net/netfilter/nf_conntrack.h> 7 11 #include <net/netfilter/nf_conntrack_extend.h> 8 - 9 12 #include <uapi/linux/netfilter/xt_connlabel.h> 10 13 11 14 #define NF_CT_LABELS_MAX_SIZE ((XT_CONNLABEL_MAXBIT + 1) / BITS_PER_BYTE) ··· 54 51 static inline int nf_connlabels_get(struct net *net, unsigned int bit) { return 0; } 55 52 static inline void nf_connlabels_put(struct net *net) {} 56 53 #endif 54 + 55 + #endif /* _NF_CONNTRACK_LABELS_H */
+1 -1
include/net/netfilter/nf_flow_table.h
··· 127 127 #define MODULE_ALIAS_NF_FLOWTABLE(family) \ 128 128 MODULE_ALIAS("nf-flowtable-" __stringify(family)) 129 129 130 - #endif /* _FLOW_OFFLOAD_H */ 130 + #endif /* _NF_FLOW_TABLE_H */