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-28 02:32:09 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge "msm: netfilter: NATTYPE Refresh Timer Changes"

Browse source
This commit is contained in:
qctecmdr 2020-10-02 22:58:44 -07:00 • committed by Gerrit - the friendly Code Review server
commit 116b7811ee
6 changed files with 153 additions and 52 deletions
Download patch file Download diff file Expand all files Collapse all files

9
include/net/netfilter/nf_conntrack.h
View file

@ -55,6 +55,11 @@ struct nf_conntrack_net {
#include <net/netfilter/ipv4/nf_conntrack_ipv4.h>
#include <net/netfilter/ipv6/nf_conntrack_ipv6.h>
/* Handle NATTYPE Stuff,only if NATTYPE module was defined */
#ifdef CONFIG_IP_NF_TARGET_NATTYPE_MODULE
#include <linux/netfilter_ipv4/ipt_NATTYPE.h>
#endif
struct nf_conn {
/* Usage count in here is 1 for hash table, 1 per skb,
* plus 1 for any connection(s) we are `master' for
@ -103,6 +108,10 @@ struct nf_conn {
/* Extensions */
struct nf_ct_ext *ext;
#ifdef CONFIG_IP_NF_TARGET_NATTYPE_MODULE
unsigned long nattype_entry;
#endif
/* Storage reserved for other modules, must be the last member */
union nf_conntrack_proto proto;
};

4
include/net/netfilter/nf_conntrack_core.h
View file

@ -43,6 +43,10 @@ void nf_conntrack_cleanup_end(void);
bool nf_ct_invert_tuple(struct nf_conntrack_tuple *inverse,
const struct nf_conntrack_tuple *orig);
extern bool (*nattype_refresh_timer)
(unsigned long nattype,
unsigned long timeout_value)
__rcu __read_mostly;
/* Find a connection corresponding to a tuple. */
struct nf_conntrack_tuple_hash *