* [patch net-next 1/5] xfrm: checkpatch errors with space
2013-12-19 12:22 [patch net-next 0/5] xfrm: fix checkpatch errors Chen Weilong
@ 2013-12-19 12:22 ` Chen Weilong
2013-12-19 12:22 ` [patch net-next 2/5] xfrm: checkpatch errors with foo * bar Chen Weilong
` (3 subsequent siblings)
4 siblings, 0 replies; 8+ messages in thread
From: Chen Weilong @ 2013-12-19 12:22 UTC (permalink / raw)
To: steffen.klassert, herbert, davem; +Cc: netdev
From: Weilong Chen <chenweilong@huawei.com>
This patch cleanup some space errors.
Signed-off-by: Weilong Chen <chenweilong@huawei.com>
---
net/xfrm/xfrm_policy.c | 10 +++++-----
net/xfrm/xfrm_proc.c | 2 +-
net/xfrm/xfrm_state.c | 10 +++++-----
net/xfrm/xfrm_user.c | 4 ++--
4 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/net/xfrm/xfrm_policy.c b/net/xfrm/xfrm_policy.c
index 9a91f74..439c6a1 100644
--- a/net/xfrm/xfrm_policy.c
+++ b/net/xfrm/xfrm_policy.c
@@ -1281,7 +1281,7 @@ xfrm_tmpl_resolve_one(struct xfrm_policy *policy, const struct flowi *fl,
xfrm_address_t *saddr = xfrm_flowi_saddr(fl, family);
xfrm_address_t tmp;
- for (nx=0, i = 0; i < policy->xfrm_nr; i++) {
+ for (nx = 0, i = 0; i < policy->xfrm_nr; i++) {
struct xfrm_state *x;
xfrm_address_t *remote = daddr;
xfrm_address_t *local = saddr;
@@ -1321,7 +1321,7 @@ xfrm_tmpl_resolve_one(struct xfrm_policy *policy, const struct flowi *fl,
return nx;
fail:
- for (nx--; nx>=0; nx--)
+ for (nx--; nx >= 0; nx--)
xfrm_state_put(xfrm[nx]);
return error;
}
@@ -1358,7 +1358,7 @@ xfrm_tmpl_resolve(struct xfrm_policy **pols, int npols, const struct flowi *fl,
return cnx;
fail:
- for (cnx--; cnx>=0; cnx--)
+ for (cnx--; cnx >= 0; cnx--)
xfrm_state_put(tpp[cnx]);
return error;
@@ -2344,7 +2344,7 @@ int __xfrm_policy_check(struct sock *sk, int dir, struct sk_buff *skb,
if (skb->sp) {
int i;
- for (i=skb->sp->len-1; i>=0; i--) {
+ for (i = skb->sp->len-1; i >= 0; i--) {
struct xfrm_state *x = skb->sp->xvec[i];
if (!xfrm_selector_match(&x->sel, &fl, family)) {
XFRM_INC_STATS(net, LINUX_MIB_XFRMINSTATEMISMATCH);
@@ -2992,7 +2992,7 @@ static void xfrm_audit_common_policyinfo(struct xfrm_policy *xp,
audit_log_format(audit_buf, " sec_alg=%u sec_doi=%u sec_obj=%s",
ctx->ctx_alg, ctx->ctx_doi, ctx->ctx_str);
- switch(sel->family) {
+ switch (sel->family) {
case AF_INET:
audit_log_format(audit_buf, " src=%pI4", &sel->saddr.a4);
if (sel->prefixlen_s != 32)
diff --git a/net/xfrm/xfrm_proc.c b/net/xfrm/xfrm_proc.c
index 80cd1e5..fc5abd0 100644
--- a/net/xfrm/xfrm_proc.c
+++ b/net/xfrm/xfrm_proc.c
@@ -52,7 +52,7 @@ static int xfrm_statistics_seq_show(struct seq_file *seq, void *v)
{
struct net *net = seq->private;
int i;
- for (i=0; xfrm_mib_list[i].name; i++)
+ for (i = 0; xfrm_mib_list[i].name; i++)
seq_printf(seq, "%-24s\t%lu\n", xfrm_mib_list[i].name,
snmp_fold_field((void __percpu **)
net->mib.xfrm_statistics,
diff --git a/net/xfrm/xfrm_state.c b/net/xfrm/xfrm_state.c
index 68c2f35..5d31934 100644
--- a/net/xfrm/xfrm_state.c
+++ b/net/xfrm/xfrm_state.c
@@ -453,7 +453,7 @@ static enum hrtimer_restart xfrm_timer_handler(struct hrtimer * me)
if (warn)
km_state_expired(x, 0, 0);
resched:
- if (next != LONG_MAX){
+ if (next != LONG_MAX) {
tasklet_hrtimer_start(&x->mtimer, ktime_set(next, 0), HRTIMER_MODE_REL);
}
@@ -1357,7 +1357,7 @@ int xfrm_state_check_expire(struct xfrm_state *x)
if (x->curlft.bytes >= x->lft.hard_byte_limit ||
x->curlft.packets >= x->lft.hard_packet_limit) {
x->km.state = XFRM_STATE_EXPIRED;
- tasklet_hrtimer_start(&x->mtimer, ktime_set(0,0), HRTIMER_MODE_REL);
+ tasklet_hrtimer_start(&x->mtimer, ktime_set(0, 0), HRTIMER_MODE_REL);
return -EINVAL;
}
@@ -1525,7 +1525,7 @@ int xfrm_alloc_spi(struct xfrm_state *x, u32 low, u32 high)
x->id.spi = minspi;
} else {
u32 spi = 0;
- for (h=0; h<high-low+1; h++) {
+ for (h = 0; h < high-low+1; h++) {
spi = low + net_random()%(high-low+1);
x0 = xfrm_state_lookup(net, mark, &x->id.daddr, htonl(spi), x->id.proto, x->props.family);
if (x0 == NULL) {
@@ -2070,7 +2070,7 @@ static void xfrm_audit_helper_sainfo(struct xfrm_state *x,
audit_log_format(audit_buf, " sec_alg=%u sec_doi=%u sec_obj=%s",
ctx->ctx_alg, ctx->ctx_doi, ctx->ctx_str);
- switch(x->props.family) {
+ switch (x->props.family) {
case AF_INET:
audit_log_format(audit_buf, " src=%pI4 dst=%pI4",
&x->props.saddr.a4, &x->id.daddr.a4);
@@ -2100,7 +2100,7 @@ static void xfrm_audit_helper_pktinfo(struct sk_buff *skb, u16 family,
iph6 = ipv6_hdr(skb);
audit_log_format(audit_buf,
" src=%pI6 dst=%pI6 flowlbl=0x%x%02x%02x",
- &iph6->saddr,&iph6->daddr,
+ &iph6->saddr, &iph6->daddr,
iph6->flow_lbl[0] & 0x0f,
iph6->flow_lbl[1],
iph6->flow_lbl[2]);
diff --git a/net/xfrm/xfrm_user.c b/net/xfrm/xfrm_user.c
index f964d4c..d998c7c 100644
--- a/net/xfrm/xfrm_user.c
+++ b/net/xfrm/xfrm_user.c
@@ -1740,11 +1740,11 @@ static int build_aevent(struct sk_buff *skb, struct xfrm_state *x, const struct
return -EMSGSIZE;
id = nlmsg_data(nlh);
- memcpy(&id->sa_id.daddr, &x->id.daddr,sizeof(x->id.daddr));
+ memcpy(&id->sa_id.daddr, &x->id.daddr, sizeof(x->id.daddr));
id->sa_id.spi = x->id.spi;
id->sa_id.family = x->props.family;
id->sa_id.proto = x->id.proto;
- memcpy(&id->saddr, &x->props.saddr,sizeof(x->props.saddr));
+ memcpy(&id->saddr, &x->props.saddr, sizeof(x->props.saddr));
id->reqid = x->props.reqid;
id->flags = c->data.aevent;
--
1.7.12
^ permalink raw reply related [flat|nested] 8+ messages in thread* [patch net-next 2/5] xfrm: checkpatch errors with foo * bar
2013-12-19 12:22 [patch net-next 0/5] xfrm: fix checkpatch errors Chen Weilong
2013-12-19 12:22 ` [patch net-next 1/5] xfrm: checkpatch errors with space Chen Weilong
@ 2013-12-19 12:22 ` Chen Weilong
2013-12-20 8:50 ` Steffen Klassert
2013-12-19 12:22 ` [patch net-next 3/5] xfrm: checkpatch erros with space prohibited Chen Weilong
` (2 subsequent siblings)
4 siblings, 1 reply; 8+ messages in thread
From: Chen Weilong @ 2013-12-19 12:22 UTC (permalink / raw)
To: steffen.klassert, herbert, davem; +Cc: netdev
From: Weilong Chen <chenweilong@huawei.com>
This patch clean up some checkpatch errors like this:
ERROR: "foo * bar" should be "foo *bar"
ERROR: "(foo*)" should be "(foo *)"
Signed-off-by: Weilong Chen <chenweilong@huawei.com>
---
net/xfrm/xfrm_input.c | 6 +++---
net/xfrm/xfrm_policy.c | 12 ++++++------
net/xfrm/xfrm_state.c | 10 +++++-----
3 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/net/xfrm/xfrm_input.c b/net/xfrm/xfrm_input.c
index 8884399..6c7ac01 100644
--- a/net/xfrm/xfrm_input.c
+++ b/net/xfrm/xfrm_input.c
@@ -67,7 +67,7 @@ int xfrm_parse_spi(struct sk_buff *skb, u8 nexthdr, __be32 *spi, __be32 *seq)
case IPPROTO_COMP:
if (!pskb_may_pull(skb, sizeof(struct ip_comp_hdr)))
return -EINVAL;
- *spi = htonl(ntohs(*(__be16*)(skb_transport_header(skb) + 2)));
+ *spi = htonl(ntohs(*(__be16 *)(skb_transport_header(skb) + 2)));
*seq = 0;
return 0;
default:
@@ -77,8 +77,8 @@ int xfrm_parse_spi(struct sk_buff *skb, u8 nexthdr, __be32 *spi, __be32 *seq)
if (!pskb_may_pull(skb, hlen))
return -EINVAL;
- *spi = *(__be32*)(skb_transport_header(skb) + offset);
- *seq = *(__be32*)(skb_transport_header(skb) + offset_seq);
+ *spi = *(__be32 *)(skb_transport_header(skb) + offset);
+ *seq = *(__be32 *)(skb_transport_header(skb) + offset_seq);
return 0;
}
diff --git a/net/xfrm/xfrm_policy.c b/net/xfrm/xfrm_policy.c
index 439c6a1..e6f34de 100644
--- a/net/xfrm/xfrm_policy.c
+++ b/net/xfrm/xfrm_policy.c
@@ -176,7 +176,7 @@ static inline unsigned long make_jiffies(long secs)
static void xfrm_policy_timer(unsigned long data)
{
- struct xfrm_policy *xp = (struct xfrm_policy*)data;
+ struct xfrm_policy *xp = (struct xfrm_policy *)data;
unsigned long now = get_seconds();
long next = LONG_MAX;
int warn = 0;
@@ -1753,7 +1753,7 @@ xfrm_resolve_and_create_bundle(struct xfrm_policy **pols, int num_pols,
}
xdst->num_pols = num_pols;
- memcpy(xdst->pols, pols, sizeof(struct xfrm_policy*) * num_pols);
+ memcpy(xdst->pols, pols, sizeof(struct xfrm_policy *) * num_pols);
xdst->policy_genid = atomic_read(&pols[0]->genid);
return xdst;
@@ -2023,7 +2023,7 @@ make_dummy_bundle:
}
xdst->num_pols = num_pols;
xdst->num_xfrms = num_xfrms;
- memcpy(xdst->pols, pols, sizeof(struct xfrm_policy*) * num_pols);
+ memcpy(xdst->pols, pols, sizeof(struct xfrm_policy *) * num_pols);
dst_hold(&xdst->u.dst);
return &xdst->flo;
@@ -2133,7 +2133,7 @@ restart:
num_pols = xdst->num_pols;
num_xfrms = xdst->num_xfrms;
- memcpy(pols, xdst->pols, sizeof(struct xfrm_policy*) * num_pols);
+ memcpy(pols, xdst->pols, sizeof(struct xfrm_policy *) * num_pols);
route = xdst->route;
}
@@ -3069,8 +3069,8 @@ static bool xfrm_migrate_selector_match(const struct xfrm_selector *sel_cmp,
return false;
}
-static struct xfrm_policy * xfrm_migrate_policy_find(const struct xfrm_selector *sel,
- u8 dir, u8 type)
+static struct xfrm_policy *xfrm_migrate_policy_find(const struct xfrm_selector *sel,
+ u8 dir, u8 type)
{
struct xfrm_policy *pol, *ret = NULL;
struct hlist_head *chain;
diff --git a/net/xfrm/xfrm_state.c b/net/xfrm/xfrm_state.c
index 5d31934..90dc310 100644
--- a/net/xfrm/xfrm_state.c
+++ b/net/xfrm/xfrm_state.c
@@ -386,7 +386,7 @@ static inline unsigned long make_jiffies(long secs)
return secs*HZ;
}
-static enum hrtimer_restart xfrm_timer_handler(struct hrtimer * me)
+static enum hrtimer_restart xfrm_timer_handler(struct hrtimer *me)
{
struct tasklet_hrtimer *thr = container_of(me, struct tasklet_hrtimer, timer);
struct xfrm_state *x = container_of(thr, struct xfrm_state, mtimer);
@@ -1204,7 +1204,7 @@ out:
}
/* xfrm_state_lock is held */
-struct xfrm_state * xfrm_migrate_state_find(struct xfrm_migrate *m)
+struct xfrm_state *xfrm_migrate_state_find(struct xfrm_migrate *m)
{
unsigned int h;
struct xfrm_state *x;
@@ -1247,8 +1247,8 @@ struct xfrm_state * xfrm_migrate_state_find(struct xfrm_migrate *m)
}
EXPORT_SYMBOL(xfrm_migrate_state_find);
-struct xfrm_state * xfrm_state_migrate(struct xfrm_state *x,
- struct xfrm_migrate *m)
+struct xfrm_state *xfrm_state_migrate(struct xfrm_state *x,
+ struct xfrm_migrate *m)
{
struct xfrm_state *xc;
int err;
@@ -1613,7 +1613,7 @@ EXPORT_SYMBOL(xfrm_state_walk_done);
static void xfrm_replay_timer_handler(unsigned long data)
{
- struct xfrm_state *x = (struct xfrm_state*)data;
+ struct xfrm_state *x = (struct xfrm_state *)data;
spin_lock(&x->lock);
--
1.7.12
^ permalink raw reply related [flat|nested] 8+ messages in thread* Re: [patch net-next 2/5] xfrm: checkpatch errors with foo * bar
2013-12-19 12:22 ` [patch net-next 2/5] xfrm: checkpatch errors with foo * bar Chen Weilong
@ 2013-12-20 8:50 ` Steffen Klassert
2013-12-20 8:54 ` chenweilong
0 siblings, 1 reply; 8+ messages in thread
From: Steffen Klassert @ 2013-12-20 8:50 UTC (permalink / raw)
To: Chen Weilong; +Cc: herbert, davem, netdev
On Thu, Dec 19, 2013 at 08:22:11PM +0800, Chen Weilong wrote:
> From: Weilong Chen <chenweilong@huawei.com>
>
> This patch clean up some checkpatch errors like this:
> ERROR: "foo * bar" should be "foo *bar"
> ERROR: "(foo*)" should be "(foo *)"
>
> Signed-off-by: Weilong Chen <chenweilong@huawei.com>
This patch does not apply to the ipsec-next tree.
Please rebase your patchset to ipsec-next and resend.
Thanks!
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [patch net-next 2/5] xfrm: checkpatch errors with foo * bar
2013-12-20 8:50 ` Steffen Klassert
@ 2013-12-20 8:54 ` chenweilong
0 siblings, 0 replies; 8+ messages in thread
From: chenweilong @ 2013-12-20 8:54 UTC (permalink / raw)
To: Steffen Klassert; +Cc: herbert, davem, netdev
On 2013/12/20 16:50, Steffen Klassert wrote:
> On Thu, Dec 19, 2013 at 08:22:11PM +0800, Chen Weilong wrote:
>> From: Weilong Chen <chenweilong@huawei.com>
>>
>> This patch clean up some checkpatch errors like this:
>> ERROR: "foo * bar" should be "foo *bar"
>> ERROR: "(foo*)" should be "(foo *)"
>>
>> Signed-off-by: Weilong Chen <chenweilong@huawei.com>
>
> This patch does not apply to the ipsec-next tree.
> Please rebase your patchset to ipsec-next and resend.
>
> Thanks!
> --
> To unsubscribe from this list: send the line "unsubscribe netdev" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
>
>
OK,I'll do that,Thanks!
^ permalink raw reply [flat|nested] 8+ messages in thread
* [patch net-next 3/5] xfrm: checkpatch erros with space prohibited
2013-12-19 12:22 [patch net-next 0/5] xfrm: fix checkpatch errors Chen Weilong
2013-12-19 12:22 ` [patch net-next 1/5] xfrm: checkpatch errors with space Chen Weilong
2013-12-19 12:22 ` [patch net-next 2/5] xfrm: checkpatch errors with foo * bar Chen Weilong
@ 2013-12-19 12:22 ` Chen Weilong
2013-12-19 12:22 ` [patch net-next 4/5] xfrm: fix checkpatch error Chen Weilong
2013-12-19 12:22 ` [patch net-next 5/5] xfrm: checkpatch erros with inline keyword position Chen Weilong
4 siblings, 0 replies; 8+ messages in thread
From: Chen Weilong @ 2013-12-19 12:22 UTC (permalink / raw)
To: steffen.klassert, herbert, davem; +Cc: netdev
From: Weilong Chen <chenweilong@huawei.com>
Fix checkpatch error "space prohibited xxx".
Signed-off-by: Weilong Chen <chenweilong@huawei.com>
---
net/xfrm/xfrm_policy.c | 6 +++---
net/xfrm/xfrm_user.c | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/net/xfrm/xfrm_policy.c b/net/xfrm/xfrm_policy.c
index e6f34de..ccf3063 100644
--- a/net/xfrm/xfrm_policy.c
+++ b/net/xfrm/xfrm_policy.c
@@ -1699,7 +1699,7 @@ static int xfrm_expand_policies(const struct flowi *fl, u16 family,
xfrm_pols_put(pols, *num_pols);
return PTR_ERR(pols[1]);
}
- (*num_pols) ++;
+ (*num_pols)++;
(*num_xfrms) += pols[1]->xfrm_nr;
}
}
@@ -2390,7 +2390,7 @@ int __xfrm_policy_check(struct sock *sk, int dir, struct sk_buff *skb,
pol->curlft.use_time = get_seconds();
pols[0] = pol;
- npols ++;
+ npols++;
#ifdef CONFIG_XFRM_SUB_POLICY
if (pols[0]->type != XFRM_POLICY_TYPE_MAIN) {
pols[1] = xfrm_policy_lookup_bytype(net, XFRM_POLICY_TYPE_MAIN,
@@ -2402,7 +2402,7 @@ int __xfrm_policy_check(struct sock *sk, int dir, struct sk_buff *skb,
return 0;
}
pols[1]->curlft.use_time = get_seconds();
- npols ++;
+ npols++;
}
}
#endif
diff --git a/net/xfrm/xfrm_user.c b/net/xfrm/xfrm_user.c
index d998c7c..508de8f 100644
--- a/net/xfrm/xfrm_user.c
+++ b/net/xfrm/xfrm_user.c
@@ -1833,7 +1833,7 @@ static int xfrm_new_ae(struct sk_buff *skb, struct nlmsghdr *nlh,
struct net *net = sock_net(skb->sk);
struct xfrm_state *x;
struct km_event c;
- int err = - EINVAL;
+ int err = -EINVAL;
u32 mark = 0;
struct xfrm_mark m;
struct xfrm_aevent_id *p = nlmsg_data(nlh);
--
1.7.12
^ permalink raw reply related [flat|nested] 8+ messages in thread* [patch net-next 4/5] xfrm: fix checkpatch error
2013-12-19 12:22 [patch net-next 0/5] xfrm: fix checkpatch errors Chen Weilong
` (2 preceding siblings ...)
2013-12-19 12:22 ` [patch net-next 3/5] xfrm: checkpatch erros with space prohibited Chen Weilong
@ 2013-12-19 12:22 ` Chen Weilong
2013-12-19 12:22 ` [patch net-next 5/5] xfrm: checkpatch erros with inline keyword position Chen Weilong
4 siblings, 0 replies; 8+ messages in thread
From: Chen Weilong @ 2013-12-19 12:22 UTC (permalink / raw)
To: steffen.klassert, herbert, davem; +Cc: netdev
From: Weilong Chen <chenweilong@huawei.com>
Fix that "else should follow close brace '}'".
Signed-off-by: Weilong Chen <chenweilong@huawei.com>
---
net/xfrm/xfrm_policy.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/net/xfrm/xfrm_policy.c b/net/xfrm/xfrm_policy.c
index ccf3063..8be5abb 100644
--- a/net/xfrm/xfrm_policy.c
+++ b/net/xfrm/xfrm_policy.c
@@ -1311,8 +1311,7 @@ xfrm_tmpl_resolve_one(struct xfrm_policy *policy, const struct flowi *fl,
error = (x->km.state == XFRM_STATE_ERROR ?
-EINVAL : -EAGAIN);
xfrm_state_put(x);
- }
- else if (error == -ESRCH)
+ } else if (error == -ESRCH)
error = -EAGAIN;
if (!tmpl->optional)
--
1.7.12
^ permalink raw reply related [flat|nested] 8+ messages in thread* [patch net-next 5/5] xfrm: checkpatch erros with inline keyword position
2013-12-19 12:22 [patch net-next 0/5] xfrm: fix checkpatch errors Chen Weilong
` (3 preceding siblings ...)
2013-12-19 12:22 ` [patch net-next 4/5] xfrm: fix checkpatch error Chen Weilong
@ 2013-12-19 12:22 ` Chen Weilong
4 siblings, 0 replies; 8+ messages in thread
From: Chen Weilong @ 2013-12-19 12:22 UTC (permalink / raw)
To: steffen.klassert, herbert, davem; +Cc: netdev
From: Weilong Chen <chenweilong@huawei.com>
inline keyword should sit between storage class and type.
Signed-off-by: Weilong Chen <chenweilong@huawei.com>
---
net/xfrm/xfrm_policy.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/net/xfrm/xfrm_policy.c b/net/xfrm/xfrm_policy.c
index 8be5abb..7a55437 100644
--- a/net/xfrm/xfrm_policy.c
+++ b/net/xfrm/xfrm_policy.c
@@ -1635,7 +1635,7 @@ free_dst:
goto out;
}
-static int inline
+static inline int
xfrm_dst_alloc_copy(void **target, const void *src, int size)
{
if (!*target) {
@@ -1647,7 +1647,7 @@ xfrm_dst_alloc_copy(void **target, const void *src, int size)
return 0;
}
-static int inline
+static inline int
xfrm_dst_update_parent(struct dst_entry *dst, const struct xfrm_selector *sel)
{
#ifdef CONFIG_XFRM_SUB_POLICY
@@ -1659,7 +1659,7 @@ xfrm_dst_update_parent(struct dst_entry *dst, const struct xfrm_selector *sel)
#endif
}
-static int inline
+static inline int
xfrm_dst_update_origin(struct dst_entry *dst, const struct flowi *fl)
{
#ifdef CONFIG_XFRM_SUB_POLICY
--
1.7.12
^ permalink raw reply related [flat|nested] 8+ messages in thread