From a4dbd72a1191c6d975fb5735afcca49c19fa1fac Mon Sep 17 00:00:00 2001 From: Simon Horman Date: Tue, 21 Sep 2010 21:17:30 +0000 Subject: [PATCH] --- yaml --- r: 211095 b: refs/heads/master c: 7874896a26624214bd7c05eeba7c8ab01548b1b5 h: refs/heads/master i: 211093: a5fa5cde8ddc78472e605be1409d963d26fb05d9 211091: 6984594d85ec4504b13d138ec51ccb93884486e9 211087: 20700c0721133fcd9d3b58ea95e04172c059fd40 v: v3 --- [refs] | 2 +- trunk/net/netfilter/nf_conntrack_sip.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index f9178412f02d..0632c857b383 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d485d500cf6b13a33bc7a6c09091deea7ea603ca +refs/heads/master: 7874896a26624214bd7c05eeba7c8ab01548b1b5 diff --git a/trunk/net/netfilter/nf_conntrack_sip.c b/trunk/net/netfilter/nf_conntrack_sip.c index 53d892210a04..f64de9544866 100644 --- a/trunk/net/netfilter/nf_conntrack_sip.c +++ b/trunk/net/netfilter/nf_conntrack_sip.c @@ -1376,7 +1376,7 @@ static int sip_help_tcp(struct sk_buff *skb, unsigned int protoff, unsigned int msglen, origlen; const char *dptr, *end; s16 diff, tdiff = 0; - int ret; + int ret = NF_ACCEPT; typeof(nf_nat_sip_seq_adjust_hook) nf_nat_sip_seq_adjust; if (ctinfo != IP_CT_ESTABLISHED &&