diff options
| author | Shawn Guo <shawn.guo@linaro.org> | 2012-09-17 11:10:58 +0400 |
|---|---|---|
| committer | Shawn Guo <shawn.guo@linaro.org> | 2012-09-17 11:10:58 +0400 |
| commit | 8f71fb87e288c5f374ea0e0ddac18707b6649f72 (patch) | |
| tree | dd77032ddcfcfe995436031281eb008a471cfc30 /include/linux/netfilter | |
| parent | d9875690d9b89a866022ff49e3fcea892345ad92 (diff) | |
| parent | f8135a74df53ba7010a162dddd112b73ee5652e3 (diff) | |
| download | linux-8f71fb87e288c5f374ea0e0ddac18707b6649f72.tar.xz | |
Merge tag 'imx-dt-3.7' into imx/dt-for-3.7-2
Diffstat (limited to 'include/linux/netfilter')
| -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, |