Skip to content

Commit

Permalink
Fix compilation on --enable-physdev-override
Browse files Browse the repository at this point in the history 
    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 <[email protected]>
  • Loading branch information
@aabc
aabc committed Nov 5, 2020
1 parent 6d0e6ec commit 83a20ef
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion compat.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -696,7 +696,7 @@ static inline int is_vlan_dev(struct net_device *dev)
#endif

#ifdef CONFIG_BRIDGE_NETFILTER
# ifdef HAVE_NF_BRIDGE_INFO_GET
# ifndef HAVE_NF_BRIDGE_INFO_GET
static inline struct nf_bridge_info *
nf_bridge_info_get(const struct sk_buff *skb)
{
Expand Down

0 comments on commit 83a20ef

Please sign in to comment.