gentoo-mirror/gentoo
1
0
Fork 0
mirror of https://github.com/gentoo-mirror/gentoo.git synced 2026-08-24 18:58:08 -07:00
Code Issues Projects Releases Wiki Activity

net-firewall/ipt_netflow: backport fix for building with kernel 4.13

Browse Source 
Reported-by: Toralf Förster <toralf@gentoo.org>
Closes: https://bugs.gentoo.org/630446

Package-Manager: Portage-2.3.7, Repoman-2.3.1
This commit is contained in:
Sergey Popov
2017-09-11 12:32:01 +03:00
parent b413668e97
commit 3c5c24508b
2 changed files with 66 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

63
net-firewall/ipt_netflow/files/ipt_netflow-2.2-linux-4.13.patch Normal file
View File

@@ -0,0 +1,63 @@
commit 53a556cb4a705f4eae2bcb49552b6427b231378a
Author: ABC <abc@telekom.ru>
Date: Mon Aug 14 22:55:25 2017 +0300
Compatibility with kernel 4.13.
Offset patch torvalds/linux@14afee4b6092fde451ee17604e5f5c89da33e71e
diff --git a/compat.h b/compat.h
index 061eb57..275ff58 100644
--- a/compat.h
+++ b/compat.h
@@ -636,4 +636,10 @@ static inline unsigned int xt_hooknum(const struct xt_action_param *par)
# define SK_CAN_REUSE 1
#endif
+#if LINUX_VERSION_CODE < KERNEL_VERSION(4,13,0)
+# define compat_refcount_read atomic_read
+#else
+# define compat_refcount_read refcount_read
+#endif
+
#endif /* COMPAT_NETFLOW_H */
diff --git a/ipt_NETFLOW.c b/ipt_NETFLOW.c
index 494ea74..9365325 100644
--- a/ipt_NETFLOW.c
+++ b/ipt_NETFLOW.c
@@ -622,7 +622,7 @@ static int snmp_seq_show(struct seq_file *seq, void *v)
seq_printf(seq, " %u %u %u\n",
sk->sk_sndbuf,
- atomic_read(&sk->sk_wmem_alloc),
+ compat_refcount_read(&sk->sk_wmem_alloc),
wmem_peak);
} else
seq_printf(seq, " 0 0 %u\n", wmem_peak);
@@ -864,7 +864,7 @@ static int nf_seq_show(struct seq_file *seq, void *v)
seq_printf(seq, ", sndbuf %u, filled %u, peak %u;"
" err: sndbuf reached %u, connect %u, cberr %u, other %u\n",
sk->sk_sndbuf,
- atomic_read(&sk->sk_wmem_alloc),
+ compat_refcount_read(&sk->sk_wmem_alloc),
atomic_read(&usock->wmem_peak),
usock->err_full,
usock->err_connect,
@@ -2031,7 +2031,7 @@ static void netflow_sendmsg(void *buffer, const int len)
printk(KERN_INFO "netflow_sendmsg: sendmsg(%d, %d) [%u %u]\n",
snum,
len,
- atomic_read(&usock->sock->sk->sk_wmem_alloc),
+ compat_refcount_read(&usock->sock->sk->sk_wmem_alloc),
usock->sock->sk->sk_sndbuf);
ret = kernel_sendmsg(usock->sock, &msg, &iov, 1, (size_t)len);
if (ret < 0) {
@@ -2054,7 +2054,7 @@ static void netflow_sendmsg(void *buffer, const int len)
printk(KERN_ERR "ipt_NETFLOW: sendmsg[%d] error %d: data loss %llu pkt, %llu bytes%s\n",
snum, ret, pdu_packets, pdu_traf, suggestion);
} else {
- unsigned int wmem = atomic_read(&usock->sock->sk->sk_wmem_alloc);
+ unsigned int wmem = compat_refcount_read(&usock->sock->sk->sk_wmem_alloc);
if (wmem > atomic_read(&usock->wmem_peak))
atomic_set(&usock->wmem_peak, wmem);
NETFLOW_STAT_INC(exported_pkt);

3
net-firewall/ipt_netflow/ipt_netflow-2.2-r1.ebuild
View File

@@ -56,6 +56,9 @@ src_prepare() {
# Compatibility with kernel 4.10, bug #617484
eapply "${FILESDIR}/${P}-linux-4.10.patch"
# Compatibility with kernel 4.13, bug #630446
eapply "${FILESDIR}/${P}-linux-4.13.patch"
eapply_user
}