Skip to content

Commit 83a20ef

Browse files
committed
Fix compilation on --enable-physdev-override
CC [M] /opt/tools/ipt-netflow/ipt_NETFLOW.o In file included from /opt/tools/ipt-netflow/ipt_NETFLOW.c:76: /opt/tools/ipt-netflow/compat.h:701:1: error: redefinition of ???nf_bridge_info_get??? nf_bridge_info_get(const struct sk_buff *skb) ^~~~~~~~~~~~~~~~~~ In file included from /opt/tools/ipt-netflow/ipt_NETFLOW.c:53: ./include/linux/netfilter_bridge.h:28:1: note: previous definition of ???nf_bridge_info_get??? was here nf_bridge_info_get(const struct sk_buff *skb) ^~~~~~~~~~~~~~~~~~ In file included from /opt/tools/ipt-netflow/ipt_NETFLOW.c:76: /opt/tools/ipt-netflow/compat.h: In function ???nf_bridge_info_get???: /opt/tools/ipt-netflow/compat.h:703:14: error: ???const struct sk_buff??? has no member named ???nf_bridge???; did you mean ???nf_trace???? return skb->nf_bridge; ^~~~~~~~~ nf_trace Fixes: 8fe543c ("Fix compilation when CONFIG_BRIDGE_NETFILTER if undefined") Reported-by: Artem Egorkin <artem@bonzo.me>
1 parent 6d0e6ec commit 83a20ef

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

compat.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -696,7 +696,7 @@ static inline int is_vlan_dev(struct net_device *dev)
696696
#endif
697697

698698
#ifdef CONFIG_BRIDGE_NETFILTER
699-
# ifdef HAVE_NF_BRIDGE_INFO_GET
699+
# ifndef HAVE_NF_BRIDGE_INFO_GET
700700
static inline struct nf_bridge_info *
701701
nf_bridge_info_get(const struct sk_buff *skb)
702702
{

0 commit comments

Comments
 (0)