diff options
| author | David S. Miller <davem@davemloft.net> | 2012-08-20 02:44:29 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-08-20 02:44:29 -0700 |
| commit | 6c71bec66ae65305ba5c33c93aa722f21f092737 (patch) | |
| tree | ab07e16e8047bea8343d6ad34f0d5377f369aef4 /include | |
| parent | c0de08d04215031d68fa13af36f347a6cfa252ca (diff) | |
| parent | 2614f86490122bf51eb7c12ec73927f1900f4e7d (diff) | |
| download | linux-6c71bec66ae65305ba5c33c93aa722f21f092737.tar.gz linux-6c71bec66ae65305ba5c33c93aa722f21f092737.tar.bz2 linux-6c71bec66ae65305ba5c33c93aa722f21f092737.zip | |
Merge git://1984.lsi.us.es/nf
Pable Neira Ayuso says:
====================
The following five patches contain fixes for 3.6-rc, they are:
* Two fixes for message parsing in the SIP conntrack helper, from
Patrick McHardy.
* One fix for the SIP helper introduced in the user-space cthelper
infrastructure, from Patrick McHardy.
* fix missing appropriate locking while modifying one conntrack entry
from the nfqueue integration code, from myself.
* fix possible access to uninitiliazed timer in the nf_conntrack
expectation infrastructure, from myself.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/netfilter/nf_conntrack_sip.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/netfilter/nf_conntrack_sip.h b/include/linux/netfilter/nf_conntrack_sip.h index 0dfc8b7210a3..89f2a627f3f0 100644 --- a/include/linux/netfilter/nf_conntrack_sip.h +++ b/include/linux/netfilter/nf_conntrack_sip.h @@ -164,7 +164,7 @@ extern int ct_sip_parse_address_param(const struct nf_conn *ct, const char *dptr unsigned int dataoff, unsigned int datalen, const char *name, unsigned int *matchoff, unsigned int *matchlen, - union nf_inet_addr *addr); + union nf_inet_addr *addr, bool delim); extern int ct_sip_parse_numerical_param(const struct nf_conn *ct, const char *dptr, unsigned int off, unsigned int datalen, const char *name, |