Skip to content

Commit 22c47fc

Browse files
committed
Fix module build for Linux v4.3
netif_is_bridge_port() was introduced in v4.4-rc2 by "vlan: Do not put vlan headers back on bridge and macvlan ports" (28f9ee22bcdd84726dbf6267d0b58f254166b900) Signed-off-by: Andreas Beckmann <anbe@debian.org>
1 parent 55858ba commit 22c47fc

File tree

1 file changed

+2
-0
lines changed

1 file changed

+2
-0
lines changed

ipt_NETFLOW.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4882,6 +4882,8 @@ static void parse_l2_header(const struct sk_buff *skb, struct ipt_netflow_tuple
48824882
&& !(vlan->flags & VLAN_FLAG_REORDER_HDR)
48834883
# if LINUX_VERSION_CODE >= KERNEL_VERSION(4,3,0)
48844884
&& !netif_is_macvlan_port(vlan_dev)
4885+
# endif
4886+
# if LINUX_VERSION_CODE >= KERNEL_VERSION(4,4,0)
48854887
&& !netif_is_bridge_port(vlan_dev)
48864888
# endif
48874889
))

0 commit comments

Comments
 (0)