aboutsummaryrefslogtreecommitdiff
path: root/net/netfilter
diff options
context:
space:
mode:
authorNiranjan Reddy Dumbala <ndumba@codeaurora.org>2013-01-30 17:34:45 +0530
committerStephen Boyd <sboyd@codeaurora.org>2013-07-08 05:55:08 -0700
commit391a9cc7d51a772cddea9f76d9f4b604cb82ec4c (patch)
treeca88cbc5fddc25fba3d033968900d2d4781c3fa1 /net/netfilter
parent5bb666339925bcfaa4f840c86fc9859848738de7 (diff)
downloadqcom-msm-v3.10-391a9cc7d51a772cddea9f76d9f4b604cb82ec4c.tar.gz
msm: netfilter: NATTYPE Refresh Timer Changes.
When IPA is present, all the data packets go through IPA and as a result NATTYPE entry timeout will not be refreshed and eventually it times out. IPA periodically refreshes the connection tracking entry timeout. So make changes to refresh the NATTYPE entry timeout from the connection tracking module. Change-Id: I5861427990af4bfd6046d21809a778409d0d8d5f Signed-off-by: Niranjan Reddy Dumbala <ndumba@codeaurora.org>
Diffstat (limited to 'net/netfilter')
-rw-r--r--net/netfilter/nf_conntrack_core.c9
1 files changed, 9 insertions, 0 deletions
diff --git a/net/netfilter/nf_conntrack_core.c b/net/netfilter/nf_conntrack_core.c
index 0283baedcdf..0776855c597 100644
--- a/net/netfilter/nf_conntrack_core.c
+++ b/net/netfilter/nf_conntrack_core.c
@@ -841,6 +841,10 @@ init_conntrack(struct net *net, struct nf_conn *tmpl,
#ifdef CONFIG_NF_CONNTRACK_SECMARK
ct->secmark = exp->master->secmark;
#endif
+/* Intialize the NAT type entry. */
+#if defined(CONFIG_IP_NF_TARGET_NATTYPE_MODULE)
+ ct->nattype_entry = 0;
+#endif
nf_conntrack_get(&ct->master->ct_general);
NF_CT_STAT_INC(net, expect_new);
} else {
@@ -1098,6 +1102,11 @@ void __nf_ct_refresh_acct(struct nf_conn *ct,
mod_timer_pending(&ct->timeout, newtime);
}
+/* Refresh the NAT type entry. */
+#if defined(CONFIG_IP_NF_TARGET_NATTYPE_MODULE)
+ (void)nattype_refresh_timer(ct->nattype_entry);
+#endif
+
acct:
if (do_acct) {
struct nf_conn_counter *acct;