netfilter: remove unnecessary spaces

This patch removes extra spaces.

Signed-off-by: yangxingwu <xingwu.yang@gmail.com>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>

diff --git a/net/netfilter/ipset/ip_set_hash_gen.h b/net/netfilter/ipset/ip_set_hash_gen.h
index 0feb77fa9edcee1fd51f6939d001b14c5d5be728..3fced06ab752a61adfe192cd1f7c98923795f052 100644 (file)
--- a/net/netfilter/ipset/ip_set_hash_gen.h
+++ b/net/netfilter/ipset/ip_set_hash_gen.h
@@ -953,7 +953,7 @@ mtype_test_cidrs(struct ip_set *set, struct mtype_elem *d,
                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 6f9ead6319e0d840a64de28327b409399dcd8c73..67ac50104e6f4cf3fdd48719529e539b1212dd56 100644 (file)
--- a/net/netfilter/ipset/ip_set_list_set.c
+++ b/net/netfilter/ipset/ip_set_list_set.c
@@ -288,7 +288,7 @@ list_set_uadd(struct ip_set *set, void *value, const struct ip_set_ext *ext,
        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 46f06f92ab8f7f477de23ddeeb644917b432c2fe..8b80ab794a92ba3f0827151861ec630ea0af512a 100644 (file)
--- a/net/netfilter/ipvs/ip_vs_core.c
+++ b/net/netfilter/ipvs/ip_vs_core.c
@@ -617,7 +617,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 94d9d349ebb0832d43db4e203be296162c41dda0..da0280cec506b4d34f2695433300bc9a5acba0e9 100644 (file)
--- 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 000d961b97e48770e0c4c7d9d0fc48ca71773887..32b028853a7cf53191618c04dc2eb3c498defabb 100644 (file)
--- 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 0ecb3e289ef25860211ce046e173c8665aed37d9..c57d2348c50547742d3dfaf346953672dd8e0590 100644 (file)
--- 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 85c1f8c213b0f8238141a94484144f74f9a0fd0a..1926fd56df56ab00e312acf9c9a3fbe25369690e 100644 (file)
--- a/net/netfilter/nf_conntrack_proto_tcp.c
+++ b/net/netfilter/nf_conntrack_proto_tcp.c
@@ -1227,7 +1227,7 @@ static const struct nla_policy tcp_nla_policy[CTA_PROTOINFO_TCP_MAX+1] = {
        [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 6dee4f9a944cd5971306fe6ea7f96e54659a8a4f..d69e1863e5369ce9e2ca73be6aa9f2e6037dab3e 100644 (file)
--- a/net/netfilter/nfnetlink_log.c
+++ b/net/netfilter/nfnetlink_log.c
@@ -651,7 +651,7 @@ nfulnl_log_packet(struct net *net,
        /* 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 @@ nfulnl_log_packet(struct net *net,
                + 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 b6a7ce622c72c3a6d3d301b741f532bbadd7c2fd..feabdfb22920b22d3e52a4d43ac960acca0db34c 100644 (file)
--- a/net/netfilter/nfnetlink_queue.c
+++ b/net/netfilter/nfnetlink_queue.c
@@ -394,7 +394,7 @@ nfqnl_build_packet_message(struct net *net, struct nfqnl_instance *queue,
        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 @@ nfqnl_build_packet_message(struct net *net, struct nfqnl_instance *queue,
        }
 
        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 9cec9eae556a6b3052c550066d2b2486de37d9de..f56d3ed93e56bb075f65b09396e2e1be3f9d78da 100644 (file)
--- 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;