Yasuyuki KOZAKAI wrote:
> Signed-off-by: Yasuyuki Kozakai
<yasuyuki.kozakai toshiba.co.jp>
> ---
> include/net/netfilter/nf_conntrack.h | 26
---------
> include/net/netfilter/nf_conntrack_core.h | 3 +
> include/net/netfilter/nf_conntrack_extend.h | 3 +
> include/net/netfilter/nf_conntrack_helper.h | 5 ++
> net/ipv4/netfilter/nf_nat_standalone.c | 10
---
> net/netfilter/nf_conntrack_core.c | 80
+++++++++++++++++----------
> net/netfilter/nf_conntrack_helper.c | 27
++++++---
> net/netfilter/nf_conntrack_netlink.c | 37
+++++++-----
> 8 files changed, 99 insertions(+), 92 deletions(-)
I removed a few left-over likely(ptr != NULL) and
unlikely(ptr == NULL)
and applied it, thanks.
|