lkml.org 
[lkml]   [2019]   [Jul]   [18]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: [PATCH v2] net/netfilter: remove unnecessary spaces
Looks good, but you will have to wait until net-next reopens:

http://vger.kernel.org/~davem/net-next.html

Will keep this in my patchwork until that happens.

Thanks.

On Tue, Jul 16, 2019 at 10:13:01AM +0800, yangxingwu wrote:
> this patch removes extra spaces
>
> Signed-off-by: yangxingwu <xingwu.yang@gmail.com>
> ---
> net/netfilter/ipset/ip_set_hash_gen.h | 2 +-
> net/netfilter/ipset/ip_set_list_set.c | 2 +-
> net/netfilter/ipvs/ip_vs_core.c | 2 +-
> net/netfilter/ipvs/ip_vs_mh.c | 4 ++--
> net/netfilter/ipvs/ip_vs_proto_tcp.c | 2 +-
> net/netfilter/nf_conntrack_ftp.c | 2 +-
> net/netfilter/nf_conntrack_proto_tcp.c | 2 +-
> net/netfilter/nfnetlink_log.c | 4 ++--
> net/netfilter/nfnetlink_queue.c | 4 ++--
> net/netfilter/xt_IDLETIMER.c | 2 +-
> 10 files changed, 13 insertions(+), 13 deletions(-)
>
> diff --git a/net/netfilter/ipset/ip_set_hash_gen.h b/net/netfilter/ipset/ip_set_hash_gen.h
> index 10f6196..eb907d2 100644
> --- a/net/netfilter/ipset/ip_set_hash_gen.h
> +++ b/net/netfilter/ipset/ip_set_hash_gen.h
> @@ -954,7 +954,7 @@ struct htype {
> mtype_data_netmask(d, NCIDR_GET(h->nets[j].cidr[0]));
> #endif
> key = HKEY(d, h->initval, t->htable_bits);
> - n = rcu_dereference_bh(hbucket(t, key));
> + n = rcu_dereference_bh(hbucket(t, key));
> if (!n)
> continue;
> for (i = 0; i < n->pos; i++) {
> diff --git a/net/netfilter/ipset/ip_set_list_set.c b/net/netfilter/ipset/ip_set_list_set.c
> index 8ada318..5c2be76 100644
> --- a/net/netfilter/ipset/ip_set_list_set.c
> +++ b/net/netfilter/ipset/ip_set_list_set.c
> @@ -289,7 +289,7 @@ struct list_set {
> if (n &&
> !(SET_WITH_TIMEOUT(set) &&
> ip_set_timeout_expired(ext_timeout(n, set))))
> - n = NULL;
> + n = NULL;
>
> e = kzalloc(set->dsize, GFP_ATOMIC);
> if (!e)
> diff --git a/net/netfilter/ipvs/ip_vs_core.c b/net/netfilter/ipvs/ip_vs_core.c
> index 7138556..6b3ae76 100644
> --- a/net/netfilter/ipvs/ip_vs_core.c
> +++ b/net/netfilter/ipvs/ip_vs_core.c
> @@ -615,7 +615,7 @@ int ip_vs_leave(struct ip_vs_service *svc, struct sk_buff *skb,
> unsigned int flags = (svc->flags & IP_VS_SVC_F_ONEPACKET &&
> iph->protocol == IPPROTO_UDP) ?
> IP_VS_CONN_F_ONE_PACKET : 0;
> - union nf_inet_addr daddr = { .all = { 0, 0, 0, 0 } };
> + union nf_inet_addr daddr = { .all = { 0, 0, 0, 0 } };
>
> /* create a new connection entry */
> IP_VS_DBG(6, "%s(): create a cache_bypass entry\n", __func__);
> diff --git a/net/netfilter/ipvs/ip_vs_mh.c b/net/netfilter/ipvs/ip_vs_mh.c
> index 94d9d34..da0280c 100644
> --- a/net/netfilter/ipvs/ip_vs_mh.c
> +++ b/net/netfilter/ipvs/ip_vs_mh.c
> @@ -174,8 +174,8 @@ static int ip_vs_mh_populate(struct ip_vs_mh_state *s,
> return 0;
> }
>
> - table = kcalloc(BITS_TO_LONGS(IP_VS_MH_TAB_SIZE),
> - sizeof(unsigned long), GFP_KERNEL);
> + table = kcalloc(BITS_TO_LONGS(IP_VS_MH_TAB_SIZE),
> + sizeof(unsigned long), GFP_KERNEL);
> if (!table)
> return -ENOMEM;
>
> diff --git a/net/netfilter/ipvs/ip_vs_proto_tcp.c b/net/netfilter/ipvs/ip_vs_proto_tcp.c
> index 915ac82..c7b46a9 100644
> --- a/net/netfilter/ipvs/ip_vs_proto_tcp.c
> +++ b/net/netfilter/ipvs/ip_vs_proto_tcp.c
> @@ -710,7 +710,7 @@ static int __ip_vs_tcp_init(struct netns_ipvs *ipvs, struct ip_vs_proto_data *pd
> sizeof(tcp_timeouts));
> if (!pd->timeout_table)
> return -ENOMEM;
> - pd->tcp_state_table = tcp_states;
> + pd->tcp_state_table = tcp_states;
> return 0;
> }
>
> diff --git a/net/netfilter/nf_conntrack_ftp.c b/net/netfilter/nf_conntrack_ftp.c
> index 8c6c11b..26c1ff8 100644
> --- a/net/netfilter/nf_conntrack_ftp.c
> +++ b/net/netfilter/nf_conntrack_ftp.c
> @@ -162,7 +162,7 @@ static int try_rfc959(const char *data, size_t dlen,
> if (length == 0)
> return 0;
>
> - cmd->u3.ip = htonl((array[0] << 24) | (array[1] << 16) |
> + cmd->u3.ip = htonl((array[0] << 24) | (array[1] << 16) |
> (array[2] << 8) | array[3]);
> cmd->u.tcp.port = htons((array[4] << 8) | array[5]);
> return length;
> diff --git a/net/netfilter/nf_conntrack_proto_tcp.c b/net/netfilter/nf_conntrack_proto_tcp.c
> index 1e2cc83..48f3a67 100644
> --- a/net/netfilter/nf_conntrack_proto_tcp.c
> +++ b/net/netfilter/nf_conntrack_proto_tcp.c
> @@ -1225,7 +1225,7 @@ static int tcp_to_nlattr(struct sk_buff *skb, struct nlattr *nla,
> [CTA_PROTOINFO_TCP_WSCALE_ORIGINAL] = { .type = NLA_U8 },
> [CTA_PROTOINFO_TCP_WSCALE_REPLY] = { .type = NLA_U8 },
> [CTA_PROTOINFO_TCP_FLAGS_ORIGINAL] = { .len = sizeof(struct nf_ct_tcp_flags) },
> - [CTA_PROTOINFO_TCP_FLAGS_REPLY] = { .len = sizeof(struct nf_ct_tcp_flags) },
> + [CTA_PROTOINFO_TCP_FLAGS_REPLY] = { .len = sizeof(struct nf_ct_tcp_flags) },
> };
>
> #define TCP_NLATTR_SIZE ( \
> diff --git a/net/netfilter/nfnetlink_log.c b/net/netfilter/nfnetlink_log.c
> index 6dee4f9..d69e186 100644
> --- a/net/netfilter/nfnetlink_log.c
> +++ b/net/netfilter/nfnetlink_log.c
> @@ -651,7 +651,7 @@ static void nfulnl_instance_free_rcu(struct rcu_head *head)
> /* FIXME: do we want to make the size calculation conditional based on
> * what is actually present? way more branches and checks, but more
> * memory efficient... */
> - size = nlmsg_total_size(sizeof(struct nfgenmsg))
> + size = nlmsg_total_size(sizeof(struct nfgenmsg))
> + nla_total_size(sizeof(struct nfulnl_msg_packet_hdr))
> + nla_total_size(sizeof(u_int32_t)) /* ifindex */
> + nla_total_size(sizeof(u_int32_t)) /* ifindex */
> @@ -668,7 +668,7 @@ static void nfulnl_instance_free_rcu(struct rcu_head *head)
> + nla_total_size(sizeof(struct nfgenmsg)); /* NLMSG_DONE */
>
> if (in && skb_mac_header_was_set(skb)) {
> - size += nla_total_size(skb->dev->hard_header_len)
> + size += nla_total_size(skb->dev->hard_header_len)
> + nla_total_size(sizeof(u_int16_t)) /* hwtype */
> + nla_total_size(sizeof(u_int16_t)); /* hwlen */
> }
> diff --git a/net/netfilter/nfnetlink_queue.c b/net/netfilter/nfnetlink_queue.c
> index 89750f7..a1ef6e3 100644
> --- a/net/netfilter/nfnetlink_queue.c
> +++ b/net/netfilter/nfnetlink_queue.c
> @@ -394,7 +394,7 @@ static int nfqnl_put_bridge(struct nf_queue_entry *entry, struct sk_buff *skb)
> char *secdata = NULL;
> u32 seclen = 0;
>
> - size = nlmsg_total_size(sizeof(struct nfgenmsg))
> + size = nlmsg_total_size(sizeof(struct nfgenmsg))
> + nla_total_size(sizeof(struct nfqnl_msg_packet_hdr))
> + nla_total_size(sizeof(u_int32_t)) /* ifindex */
> + nla_total_size(sizeof(u_int32_t)) /* ifindex */
> @@ -453,7 +453,7 @@ static int nfqnl_put_bridge(struct nf_queue_entry *entry, struct sk_buff *skb)
> }
>
> if (queue->flags & NFQA_CFG_F_UID_GID) {
> - size += (nla_total_size(sizeof(u_int32_t)) /* uid */
> + size += (nla_total_size(sizeof(u_int32_t)) /* uid */
> + nla_total_size(sizeof(u_int32_t))); /* gid */
> }
>
> diff --git a/net/netfilter/xt_IDLETIMER.c b/net/netfilter/xt_IDLETIMER.c
> index 9cec9ea..f56d3ed 100644
> --- a/net/netfilter/xt_IDLETIMER.c
> +++ b/net/netfilter/xt_IDLETIMER.c
> @@ -283,7 +283,7 @@ static int __init idletimer_tg_init(void)
>
> idletimer_tg_kobj = &idletimer_tg_device->kobj;
>
> - err = xt_register_target(&idletimer_tg);
> + err = xt_register_target(&idletimer_tg);
> if (err < 0) {
> pr_debug("couldn't register xt target\n");
> goto out_dev;
> --
> 1.8.3.1
>

\
 
 \ /
  Last update: 2019-07-18 20:27    [W:0.069 / U:2.940 seconds]
©2003-2018 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site