diff options
| author | David S. Miller | 2018-09-13 07:22:42 +0200 |
|---|---|---|
| committer | David S. Miller | 2018-09-13 07:22:42 +0200 |
| commit | aaf9253025e80cf8f62d7b33670e84e838eec5a3 (patch) | |
| tree | f13b307c8407cc05ff803c4d7f6a0967d85ce3ec /include/net | |
| parent | docs: net: Remove TCP congestion document (diff) | |
| parent | Merge tag 'drm-fixes-2018-09-12' of git://anongit.freedesktop.org/drm/drm (diff) | |
| download | kernel-qcow2-linux-aaf9253025e80cf8f62d7b33670e84e838eec5a3.tar.gz kernel-qcow2-linux-aaf9253025e80cf8f62d7b33670e84e838eec5a3.tar.xz kernel-qcow2-linux-aaf9253025e80cf8f62d7b33670e84e838eec5a3.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Diffstat (limited to 'include/net')
| -rw-r--r-- | include/net/netfilter/nf_conntrack_timeout.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/net/netfilter/nf_conntrack_timeout.h b/include/net/netfilter/nf_conntrack_timeout.h index d5f62cc6c2ae..3394d75e1c80 100644 --- a/include/net/netfilter/nf_conntrack_timeout.h +++ b/include/net/netfilter/nf_conntrack_timeout.h @@ -30,7 +30,7 @@ struct nf_conn_timeout { }; static inline unsigned int * -nf_ct_timeout_data(struct nf_conn_timeout *t) +nf_ct_timeout_data(const struct nf_conn_timeout *t) { struct nf_ct_timeout *timeout; |