diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2020-11-25 22:39:15 +0000 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2020-11-25 22:39:15 +0000 |
commit | d934827bf44b7cfcf6711964418148fa60877668 (patch) | |
tree | 0625f358789b5e015e49db139cc1dbc9be00428f /net-firewall/ipt_netflow/files | |
parent | 2e34d110f164bf74d55fced27fe0000201b3eec5 (diff) |
gentoo resync : 25.11.2020
Diffstat (limited to 'net-firewall/ipt_netflow/files')
-rw-r--r-- | net-firewall/ipt_netflow/files/ipt_netflow-2.5.1-vlan_dev_priv.patch | 32 |
1 files changed, 32 insertions, 0 deletions
diff --git a/net-firewall/ipt_netflow/files/ipt_netflow-2.5.1-vlan_dev_priv.patch b/net-firewall/ipt_netflow/files/ipt_netflow-2.5.1-vlan_dev_priv.patch new file mode 100644 index 000000000000..49721e547fd7 --- /dev/null +++ b/net-firewall/ipt_netflow/files/ipt_netflow-2.5.1-vlan_dev_priv.patch @@ -0,0 +1,32 @@ +commit 1153f73f038205dc17303e6e6c455bbbb56191f7 +Author: ABC <abc@openwall.com> +Date: Wed Oct 14 15:35:57 2020 +0300 + + gen_compat_def: Check for vlan_dev_priv instead of version if + +diff --git a/gen_compat_def b/gen_compat_def +index c0f20f6..3965e94 100755 +--- a/gen_compat_def ++++ b/gen_compat_def +@@ -85,6 +85,8 @@ kbuild_test_struct proc_ops linux/proc_fs.h + kbuild_test_struct proc_ops linux/proc_fs.h + # No since v5.1, but present in CentOS-8's 4.18.0-227 + kbuild_test_symbol synchronize_sched linux/rcupdate.h ++# Stumbled on 5.9 ++kbuild_test_struct vlan_dev_priv linux/if_vlan.h + + echo "// End of compat_def.h" + +diff --git a/ipt_NETFLOW.c b/ipt_NETFLOW.c +index 01055df..6f95166 100644 +--- a/ipt_NETFLOW.c ++++ b/ipt_NETFLOW.c +@@ -4874,7 +4874,7 @@ static void parse_l2_header(const struct sk_buff *skb, struct ipt_netflow_tuple + tuple->tag[tag_num++] = htons(vlan_tx_tag_get(skb)); + else if (skb->dev && is_vlan_dev(skb->dev)) { + struct net_device *vlan_dev = skb->dev; +-# if LINUX_VERSION_CODE >= KERNEL_VERSION(3,2,0) ++# ifdef HAVE_VLAN_DEV_PRIV + struct vlan_dev_priv *vlan = vlan_dev_priv(vlan_dev); + + /* `if` condition is `#if`ed intentionally, and this is |