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/icmp.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/icmp.c')
-rw-r--r-- | net/ipv6/icmp.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/net/ipv6/icmp.c b/net/ipv6/icmp.c index 06ba3e58320b..394bb824fe4b 100644 --- a/net/ipv6/icmp.c +++ b/net/ipv6/icmp.c | |||
@@ -503,7 +503,7 @@ static void icmp6_send(struct sk_buff *skb, u8 type, u8 code, __u32 info) | |||
503 | msg.type = type; | 503 | msg.type = type; |
504 | 504 | ||
505 | len = skb->len - msg.offset; | 505 | len = skb->len - msg.offset; |
506 | len = min_t(unsigned int, len, IPV6_MIN_MTU - sizeof(struct ipv6hdr) -sizeof(struct icmp6hdr)); | 506 | len = min_t(unsigned int, len, IPV6_MIN_MTU - sizeof(struct ipv6hdr) - sizeof(struct icmp6hdr)); |
507 | if (len < 0) { | 507 | if (len < 0) { |
508 | LIMIT_NETDEBUG(KERN_DEBUG "icmp: len problem\n"); | 508 | LIMIT_NETDEBUG(KERN_DEBUG "icmp: len problem\n"); |
509 | goto out_dst_release; | 509 | goto out_dst_release; |
@@ -636,7 +636,7 @@ void icmpv6_notify(struct sk_buff *skb, u8 type, u8 code, __be32 info) | |||
636 | /* now skip over extension headers */ | 636 | /* now skip over extension headers */ |
637 | inner_offset = ipv6_skip_exthdr(skb, sizeof(struct ipv6hdr), | 637 | inner_offset = ipv6_skip_exthdr(skb, sizeof(struct ipv6hdr), |
638 | &nexthdr, &frag_off); | 638 | &nexthdr, &frag_off); |
639 | if (inner_offset<0) | 639 | if (inner_offset < 0) |
640 | goto out; | 640 | goto out; |
641 | } else { | 641 | } else { |
642 | inner_offset = sizeof(struct ipv6hdr); | 642 | inner_offset = sizeof(struct ipv6hdr); |
@@ -808,7 +808,7 @@ void icmpv6_flow_init(struct sock *sk, struct flowi6 *fl6, | |||
808 | memset(fl6, 0, sizeof(*fl6)); | 808 | memset(fl6, 0, sizeof(*fl6)); |
809 | fl6->saddr = *saddr; | 809 | fl6->saddr = *saddr; |
810 | fl6->daddr = *daddr; | 810 | fl6->daddr = *daddr; |
811 | fl6->flowi6_proto = IPPROTO_ICMPV6; | 811 | fl6->flowi6_proto = IPPROTO_ICMPV6; |
812 | fl6->fl6_icmp_type = type; | 812 | fl6->fl6_icmp_type = type; |
813 | fl6->fl6_icmp_code = 0; | 813 | fl6->fl6_icmp_code = 0; |
814 | fl6->flowi6_oif = oif; | 814 | fl6->flowi6_oif = oif; |
@@ -875,8 +875,8 @@ static void __net_exit icmpv6_sk_exit(struct net *net) | |||
875 | } | 875 | } |
876 | 876 | ||
877 | static struct pernet_operations icmpv6_sk_ops = { | 877 | static struct pernet_operations icmpv6_sk_ops = { |
878 | .init = icmpv6_sk_init, | 878 | .init = icmpv6_sk_init, |
879 | .exit = icmpv6_sk_exit, | 879 | .exit = icmpv6_sk_exit, |
880 | }; | 880 | }; |
881 | 881 | ||
882 | int __init icmpv6_init(void) | 882 | int __init icmpv6_init(void) |