A-Team_Digital_Solutions/android_kernel_motorola_sm6375
Watch
2
0
Fork
You've already forked android_kernel_motorola_sm6375
 0
mirror of https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git synced 2026-10-14 00:24:41 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge "QCMAP: Packet counters are not updated in conntrack"

Browse source
This commit is contained in:
qctecmdr 2021-04-28 17:58:46 -07:00 • committed by Gerrit - the friendly Code Review server
commit 180a53c7c1
2 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
net/netfilter/nf_conntrack_core.c
View file

@ -1888,8 +1888,8 @@ acct:
[CTINFO2DIR(ctinfo)].bytes);
pkts =
atomic64_read(&counter[CTINFO2DIR(ctinfo)].packets) +
atomic64_read(&counter[!CTINFO2DIR(ctinfo)].packets);
((u64)atomic64_read(&counter[CTINFO2DIR(ctinfo)].packets)) +
((u64)atomic64_read(&counter[!CTINFO2DIR(ctinfo)].packets));
/* Report if the packet threshold is reached. */
if (nf_conntrack_pkt_threshold > 0 &&
pkts == nf_conntrack_pkt_threshold) {

4
net/netfilter/nf_conntrack_netlink.c
View file

@ -245,8 +245,8 @@ dump_counters(struct sk_buff *skb, struct nf_conn_acct *acct,
pkts = atomic64_xchg(&counter[dir].packets, 0);
bytes = atomic64_xchg(&counter[dir].bytes, 0);
} else {
pkts = atomic64_read(&counter[dir].packets);
bytes = atomic64_read(&counter[dir].bytes);
pkts = (u64)atomic64_read(&counter[dir].packets);
bytes = (u64)atomic64_read(&counter[dir].bytes);
}
nest_count = nla_nest_start(skb, attr);