diff options
author | Weilong Chen <chenweilong@huawei.com> | 2013-12-23 20:43:47 -0500 |
---|---|---|
committer | Steffen Klassert <steffen.klassert@secunet.com> | 2014-01-02 01:48:49 -0500 |
commit | 3e94c2dcfd7ca297bd7e0a8d96be1e76dec711a3 (patch) | |
tree | 41ac49d46146b498d649c0b6b6a038f198243a5f /net | |
parent | 9b7a787d0da7db3127f6e04f8f8159632da50a36 (diff) |
xfrm: checkpatch errors with foo * bar
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>
Signed-off-by: Steffen Klassert <steffen.klassert@secunet.com>
Diffstat (limited to 'net')
-rw-r--r-- | net/xfrm/xfrm_input.c | 6 | ||||
-rw-r--r-- | net/xfrm/xfrm_policy.c | 12 | ||||
-rw-r--r-- | net/xfrm/xfrm_state.c | 8 |
3 files changed, 13 insertions, 13 deletions
diff --git a/net/xfrm/xfrm_input.c b/net/xfrm/xfrm_input.c index 88843996f935..6c7ac016ce3a 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) | |||
67 | case IPPROTO_COMP: | 67 | case IPPROTO_COMP: |
68 | if (!pskb_may_pull(skb, sizeof(struct ip_comp_hdr))) | 68 | if (!pskb_may_pull(skb, sizeof(struct ip_comp_hdr))) |
69 | return -EINVAL; | 69 | return -EINVAL; |
70 | *spi = htonl(ntohs(*(__be16*)(skb_transport_header(skb) + 2))); | 70 | *spi = htonl(ntohs(*(__be16 *)(skb_transport_header(skb) + 2))); |
71 | *seq = 0; | 71 | *seq = 0; |
72 | return 0; | 72 | return 0; |
73 | default: | 73 | default: |
@@ -77,8 +77,8 @@ int xfrm_parse_spi(struct sk_buff *skb, u8 nexthdr, __be32 *spi, __be32 *seq) | |||
77 | if (!pskb_may_pull(skb, hlen)) | 77 | if (!pskb_may_pull(skb, hlen)) |
78 | return -EINVAL; | 78 | return -EINVAL; |
79 | 79 | ||
80 | *spi = *(__be32*)(skb_transport_header(skb) + offset); | 80 | *spi = *(__be32 *)(skb_transport_header(skb) + offset); |
81 | *seq = *(__be32*)(skb_transport_header(skb) + offset_seq); | 81 | *seq = *(__be32 *)(skb_transport_header(skb) + offset_seq); |
82 | return 0; | 82 | return 0; |
83 | } | 83 | } |
84 | 84 | ||
diff --git a/net/xfrm/xfrm_policy.c b/net/xfrm/xfrm_policy.c index 8a2b9d8e1d58..dc8bd1ba4b3e 100644 --- a/net/xfrm/xfrm_policy.c +++ b/net/xfrm/xfrm_policy.c | |||
@@ -171,7 +171,7 @@ static inline unsigned long make_jiffies(long secs) | |||
171 | 171 | ||
172 | static void xfrm_policy_timer(unsigned long data) | 172 | static void xfrm_policy_timer(unsigned long data) |
173 | { | 173 | { |
174 | struct xfrm_policy *xp = (struct xfrm_policy*)data; | 174 | struct xfrm_policy *xp = (struct xfrm_policy *)data; |
175 | unsigned long now = get_seconds(); | 175 | unsigned long now = get_seconds(); |
176 | long next = LONG_MAX; | 176 | long next = LONG_MAX; |
177 | int warn = 0; | 177 | int warn = 0; |
@@ -1758,7 +1758,7 @@ xfrm_resolve_and_create_bundle(struct xfrm_policy **pols, int num_pols, | |||
1758 | } | 1758 | } |
1759 | 1759 | ||
1760 | xdst->num_pols = num_pols; | 1760 | xdst->num_pols = num_pols; |
1761 | memcpy(xdst->pols, pols, sizeof(struct xfrm_policy*) * num_pols); | 1761 | memcpy(xdst->pols, pols, sizeof(struct xfrm_policy *) * num_pols); |
1762 | xdst->policy_genid = atomic_read(&pols[0]->genid); | 1762 | xdst->policy_genid = atomic_read(&pols[0]->genid); |
1763 | 1763 | ||
1764 | return xdst; | 1764 | return xdst; |
@@ -2027,7 +2027,7 @@ make_dummy_bundle: | |||
2027 | } | 2027 | } |
2028 | xdst->num_pols = num_pols; | 2028 | xdst->num_pols = num_pols; |
2029 | xdst->num_xfrms = num_xfrms; | 2029 | xdst->num_xfrms = num_xfrms; |
2030 | memcpy(xdst->pols, pols, sizeof(struct xfrm_policy*) * num_pols); | 2030 | memcpy(xdst->pols, pols, sizeof(struct xfrm_policy *) * num_pols); |
2031 | 2031 | ||
2032 | dst_hold(&xdst->u.dst); | 2032 | dst_hold(&xdst->u.dst); |
2033 | return &xdst->flo; | 2033 | return &xdst->flo; |
@@ -2136,7 +2136,7 @@ struct dst_entry *xfrm_lookup(struct net *net, struct dst_entry *dst_orig, | |||
2136 | 2136 | ||
2137 | num_pols = xdst->num_pols; | 2137 | num_pols = xdst->num_pols; |
2138 | num_xfrms = xdst->num_xfrms; | 2138 | num_xfrms = xdst->num_xfrms; |
2139 | memcpy(pols, xdst->pols, sizeof(struct xfrm_policy*) * num_pols); | 2139 | memcpy(pols, xdst->pols, sizeof(struct xfrm_policy *) * num_pols); |
2140 | route = xdst->route; | 2140 | route = xdst->route; |
2141 | } | 2141 | } |
2142 | 2142 | ||
@@ -3064,8 +3064,8 @@ static bool xfrm_migrate_selector_match(const struct xfrm_selector *sel_cmp, | |||
3064 | return false; | 3064 | return false; |
3065 | } | 3065 | } |
3066 | 3066 | ||
3067 | static struct xfrm_policy * xfrm_migrate_policy_find(const struct xfrm_selector *sel, | 3067 | static struct xfrm_policy *xfrm_migrate_policy_find(const struct xfrm_selector *sel, |
3068 | u8 dir, u8 type, struct net *net) | 3068 | u8 dir, u8 type, struct net *net) |
3069 | { | 3069 | { |
3070 | struct xfrm_policy *pol, *ret = NULL; | 3070 | struct xfrm_policy *pol, *ret = NULL; |
3071 | struct hlist_head *chain; | 3071 | struct hlist_head *chain; |
diff --git a/net/xfrm/xfrm_state.c b/net/xfrm/xfrm_state.c index 5fe79b42561d..9e6a4d6a9d8f 100644 --- a/net/xfrm/xfrm_state.c +++ b/net/xfrm/xfrm_state.c | |||
@@ -382,7 +382,7 @@ static inline unsigned long make_jiffies(long secs) | |||
382 | return secs*HZ; | 382 | return secs*HZ; |
383 | } | 383 | } |
384 | 384 | ||
385 | static enum hrtimer_restart xfrm_timer_handler(struct hrtimer * me) | 385 | static enum hrtimer_restart xfrm_timer_handler(struct hrtimer *me) |
386 | { | 386 | { |
387 | struct tasklet_hrtimer *thr = container_of(me, struct tasklet_hrtimer, timer); | 387 | struct tasklet_hrtimer *thr = container_of(me, struct tasklet_hrtimer, timer); |
388 | struct xfrm_state *x = container_of(thr, struct xfrm_state, mtimer); | 388 | struct xfrm_state *x = container_of(thr, struct xfrm_state, mtimer); |
@@ -1237,8 +1237,8 @@ struct xfrm_state *xfrm_migrate_state_find(struct xfrm_migrate *m, struct net *n | |||
1237 | } | 1237 | } |
1238 | EXPORT_SYMBOL(xfrm_migrate_state_find); | 1238 | EXPORT_SYMBOL(xfrm_migrate_state_find); |
1239 | 1239 | ||
1240 | struct xfrm_state * xfrm_state_migrate(struct xfrm_state *x, | 1240 | struct xfrm_state *xfrm_state_migrate(struct xfrm_state *x, |
1241 | struct xfrm_migrate *m) | 1241 | struct xfrm_migrate *m) |
1242 | { | 1242 | { |
1243 | struct xfrm_state *xc; | 1243 | struct xfrm_state *xc; |
1244 | int err; | 1244 | int err; |
@@ -1630,7 +1630,7 @@ EXPORT_SYMBOL(xfrm_state_walk_done); | |||
1630 | 1630 | ||
1631 | static void xfrm_replay_timer_handler(unsigned long data) | 1631 | static void xfrm_replay_timer_handler(unsigned long data) |
1632 | { | 1632 | { |
1633 | struct xfrm_state *x = (struct xfrm_state*)data; | 1633 | struct xfrm_state *x = (struct xfrm_state *)data; |
1634 | 1634 | ||
1635 | spin_lock(&x->lock); | 1635 | spin_lock(&x->lock); |
1636 | 1636 | ||