mirror of https://gitee.com/openkylin/linux.git
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>
This commit is contained in:
parent
1b90af292e
commit
7e59b3fea2
|
@ -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++) {
|
||||
|
|
|
@ -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)
|
||||
|
|
|
@ -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__);
|
||||
|
|
|
@ -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;
|
||||
|
||||
|
|
|
@ -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;
|
||||
}
|
||||
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -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 ( \
|
||||
|
|
|
@ -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 */
|
||||
}
|
||||
|
|
|
@ -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 */
|
||||
}
|
||||
|
||||
|
|
|
@ -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;
|
||||
|
|
Loading…
Reference in New Issue