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/raw.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/raw.c')
-rw-r--r-- | net/ipv6/raw.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/net/ipv6/raw.c b/net/ipv6/raw.c index 39d44226e402..896af8807979 100644 --- a/net/ipv6/raw.c +++ b/net/ipv6/raw.c | |||
@@ -889,7 +889,7 @@ back_from_confirm: | |||
889 | else { | 889 | else { |
890 | lock_sock(sk); | 890 | lock_sock(sk); |
891 | err = ip6_append_data(sk, ip_generic_getfrag, msg->msg_iov, | 891 | err = ip6_append_data(sk, ip_generic_getfrag, msg->msg_iov, |
892 | len, 0, hlimit, tclass, opt, &fl6, (struct rt6_info*)dst, | 892 | len, 0, hlimit, tclass, opt, &fl6, (struct rt6_info *)dst, |
893 | msg->msg_flags, dontfrag); | 893 | msg->msg_flags, dontfrag); |
894 | 894 | ||
895 | if (err) | 895 | if (err) |
@@ -902,7 +902,7 @@ done: | |||
902 | dst_release(dst); | 902 | dst_release(dst); |
903 | out: | 903 | out: |
904 | fl6_sock_release(flowlabel); | 904 | fl6_sock_release(flowlabel); |
905 | return err<0?err:len; | 905 | return err < 0 ? err : len; |
906 | do_confirm: | 906 | do_confirm: |
907 | dst_confirm(dst); | 907 | dst_confirm(dst); |
908 | if (!(msg->msg_flags & MSG_PROBE) || len) | 908 | if (!(msg->msg_flags & MSG_PROBE) || len) |
@@ -1045,7 +1045,7 @@ static int do_rawv6_getsockopt(struct sock *sk, int level, int optname, | |||
1045 | struct raw6_sock *rp = raw6_sk(sk); | 1045 | struct raw6_sock *rp = raw6_sk(sk); |
1046 | int val, len; | 1046 | int val, len; |
1047 | 1047 | ||
1048 | if (get_user(len,optlen)) | 1048 | if (get_user(len, optlen)) |
1049 | return -EFAULT; | 1049 | return -EFAULT; |
1050 | 1050 | ||
1051 | switch (optname) { | 1051 | switch (optname) { |
@@ -1069,7 +1069,7 @@ static int do_rawv6_getsockopt(struct sock *sk, int level, int optname, | |||
1069 | 1069 | ||
1070 | if (put_user(len, optlen)) | 1070 | if (put_user(len, optlen)) |
1071 | return -EFAULT; | 1071 | return -EFAULT; |
1072 | if (copy_to_user(optval,&val,len)) | 1072 | if (copy_to_user(optval, &val, len)) |
1073 | return -EFAULT; | 1073 | return -EFAULT; |
1074 | return 0; | 1074 | return 0; |
1075 | } | 1075 | } |