diff options
author | Ian Morris <ipm@chirality.org.uk> | 2014-08-24 16:53:10 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2014-08-25 01:37:52 -0400 |
commit | 67ba4152e8b77eada6a9c64e3c2c84d6112794fc (patch) | |
tree | 833bd7925ed3b69ef65f759c3f806cdaa8643d00 /net/ipv6/xfrm6_policy.c | |
parent | a9b0b2faa8ed299ca617a317e2abb9ea1bf0e733 (diff) |
ipv6: White-space cleansing : Line Layouts
This patch makes no changes to the logic of the code but simply addresses
coding style issues as detected by checkpatch.
Both objdump and diff -w show no differences.
A number of items are addressed in this patch:
* Multiple spaces converted to tabs
* Spaces before tabs removed.
* Spaces in pointer typing cleansed (char *)foo etc.
* Remove space after sizeof
* Ensure spacing around comparators such as if statements.
Signed-off-by: Ian Morris <ipm@chirality.org.uk>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv6/xfrm6_policy.c')
-rw-r--r-- | net/ipv6/xfrm6_policy.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/net/ipv6/xfrm6_policy.c b/net/ipv6/xfrm6_policy.c index 2a0bbda2c76a..ac49f84fe2c3 100644 --- a/net/ipv6/xfrm6_policy.c +++ b/net/ipv6/xfrm6_policy.c | |||
@@ -3,11 +3,11 @@ | |||
3 | * | 3 | * |
4 | * Authors: | 4 | * Authors: |
5 | * Mitsuru KANDA @USAGI | 5 | * Mitsuru KANDA @USAGI |
6 | * Kazunori MIYAZAWA @USAGI | 6 | * Kazunori MIYAZAWA @USAGI |
7 | * Kunihiro Ishiguro <kunihiro@ipinfusion.com> | 7 | * Kunihiro Ishiguro <kunihiro@ipinfusion.com> |
8 | * IPv6 support | 8 | * IPv6 support |
9 | * YOSHIFUJI Hideaki | 9 | * YOSHIFUJI Hideaki |
10 | * Split up af-specific portion | 10 | * Split up af-specific portion |
11 | * | 11 | * |
12 | */ | 12 | */ |
13 | 13 | ||
@@ -84,7 +84,7 @@ static int xfrm6_init_path(struct xfrm_dst *path, struct dst_entry *dst, | |||
84 | int nfheader_len) | 84 | int nfheader_len) |
85 | { | 85 | { |
86 | if (dst->ops->family == AF_INET6) { | 86 | if (dst->ops->family == AF_INET6) { |
87 | struct rt6_info *rt = (struct rt6_info*)dst; | 87 | struct rt6_info *rt = (struct rt6_info *)dst; |
88 | if (rt->rt6i_node) | 88 | if (rt->rt6i_node) |
89 | path->path_cookie = rt->rt6i_node->fn_sernum; | 89 | path->path_cookie = rt->rt6i_node->fn_sernum; |
90 | } | 90 | } |
@@ -97,7 +97,7 @@ static int xfrm6_init_path(struct xfrm_dst *path, struct dst_entry *dst, | |||
97 | static int xfrm6_fill_dst(struct xfrm_dst *xdst, struct net_device *dev, | 97 | static int xfrm6_fill_dst(struct xfrm_dst *xdst, struct net_device *dev, |
98 | const struct flowi *fl) | 98 | const struct flowi *fl) |
99 | { | 99 | { |
100 | struct rt6_info *rt = (struct rt6_info*)xdst->route; | 100 | struct rt6_info *rt = (struct rt6_info *)xdst->route; |
101 | 101 | ||
102 | xdst->u.dst.dev = dev; | 102 | xdst->u.dst.dev = dev; |
103 | dev_hold(dev); | 103 | dev_hold(dev); |
@@ -296,7 +296,7 @@ static struct xfrm_policy_afinfo xfrm6_policy_afinfo = { | |||
296 | .family = AF_INET6, | 296 | .family = AF_INET6, |
297 | .dst_ops = &xfrm6_dst_ops, | 297 | .dst_ops = &xfrm6_dst_ops, |
298 | .dst_lookup = xfrm6_dst_lookup, | 298 | .dst_lookup = xfrm6_dst_lookup, |
299 | .get_saddr = xfrm6_get_saddr, | 299 | .get_saddr = xfrm6_get_saddr, |
300 | .decode_session = _decode_session6, | 300 | .decode_session = _decode_session6, |
301 | .get_tos = xfrm6_get_tos, | 301 | .get_tos = xfrm6_get_tos, |
302 | .init_dst = xfrm6_init_dst, | 302 | .init_dst = xfrm6_init_dst, |
@@ -319,9 +319,9 @@ static void xfrm6_policy_fini(void) | |||
319 | static struct ctl_table xfrm6_policy_table[] = { | 319 | static struct ctl_table xfrm6_policy_table[] = { |
320 | { | 320 | { |
321 | .procname = "xfrm6_gc_thresh", | 321 | .procname = "xfrm6_gc_thresh", |
322 | .data = &init_net.xfrm.xfrm6_dst_ops.gc_thresh, | 322 | .data = &init_net.xfrm.xfrm6_dst_ops.gc_thresh, |
323 | .maxlen = sizeof(int), | 323 | .maxlen = sizeof(int), |
324 | .mode = 0644, | 324 | .mode = 0644, |
325 | .proc_handler = proc_dointvec, | 325 | .proc_handler = proc_dointvec, |
326 | }, | 326 | }, |
327 | { } | 327 | { } |