projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'isci-for-3.5' into misc
[firefly-linux-kernel-4.4.55.git]
/
net
/
netfilter
/
xt_CT.c
diff --git
a/net/netfilter/xt_CT.c
b/net/netfilter/xt_CT.c
index 59530e93fa58f7abdaa4a0734ad2fd1e5241c040..3746d8b9a47868694be0848fc0d09013a0a5b282 100644
(file)
--- a/
net/netfilter/xt_CT.c
+++ b/
net/netfilter/xt_CT.c
@@
-227,7
+227,7
@@
static int xt_ct_tg_check_v1(const struct xt_tgchk_param *par)
}
#ifdef CONFIG_NF_CONNTRACK_TIMEOUT
- if (info->timeout) {
+ if (info->timeout
[0]
) {
typeof(nf_ct_timeout_find_get_hook) timeout_find_get;
struct nf_conn_timeout *timeout_ext;