Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

ipv6: Reduce switch/case indent

Make the case labels the same indent as the switch.

git diff -w shows 80 column reflowing,
removal of a useless break after return, and moving
open brace after case instead of separate line.

Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

authored by

Joe Perches and committed by
David S. Miller
207ec0ab 4500ebf8

+68 -75
+68 -75
net/ipv6/raw.c
··· 959 959 return -EFAULT; 960 960 961 961 switch (optname) { 962 - case IPV6_CHECKSUM: 963 - if (inet_sk(sk)->inet_num == IPPROTO_ICMPV6 && 964 - level == IPPROTO_IPV6) { 965 - /* 966 - * RFC3542 tells that IPV6_CHECKSUM socket 967 - * option in the IPPROTO_IPV6 level is not 968 - * allowed on ICMPv6 sockets. 969 - * If you want to set it, use IPPROTO_RAW 970 - * level IPV6_CHECKSUM socket option 971 - * (Linux extension). 972 - */ 973 - return -EINVAL; 974 - } 962 + case IPV6_CHECKSUM: 963 + if (inet_sk(sk)->inet_num == IPPROTO_ICMPV6 && 964 + level == IPPROTO_IPV6) { 965 + /* 966 + * RFC3542 tells that IPV6_CHECKSUM socket 967 + * option in the IPPROTO_IPV6 level is not 968 + * allowed on ICMPv6 sockets. 969 + * If you want to set it, use IPPROTO_RAW 970 + * level IPV6_CHECKSUM socket option 971 + * (Linux extension). 972 + */ 973 + return -EINVAL; 974 + } 975 975 976 - /* You may get strange result with a positive odd offset; 977 - RFC2292bis agrees with me. */ 978 - if (val > 0 && (val&1)) 979 - return -EINVAL; 980 - if (val < 0) { 981 - rp->checksum = 0; 982 - } else { 983 - rp->checksum = 1; 984 - rp->offset = val; 985 - } 976 + /* You may get strange result with a positive odd offset; 977 + RFC2292bis agrees with me. */ 978 + if (val > 0 && (val&1)) 979 + return -EINVAL; 980 + if (val < 0) { 981 + rp->checksum = 0; 982 + } else { 983 + rp->checksum = 1; 984 + rp->offset = val; 985 + } 986 986 987 - return 0; 988 - break; 987 + return 0; 989 988 990 - default: 991 - return -ENOPROTOOPT; 989 + default: 990 + return -ENOPROTOOPT; 992 991 } 993 992 } 994 993 995 994 static int rawv6_setsockopt(struct sock *sk, int level, int optname, 996 995 char __user *optval, unsigned int optlen) 997 996 { 998 - switch(level) { 999 - case SOL_RAW: 1000 - break; 997 + switch (level) { 998 + case SOL_RAW: 999 + break; 1001 1000 1002 - case SOL_ICMPV6: 1003 - if (inet_sk(sk)->inet_num != IPPROTO_ICMPV6) 1004 - return -EOPNOTSUPP; 1005 - return rawv6_seticmpfilter(sk, level, optname, optval, 1006 - optlen); 1007 - case SOL_IPV6: 1008 - if (optname == IPV6_CHECKSUM) 1009 - break; 1010 - default: 1011 - return ipv6_setsockopt(sk, level, optname, optval, 1012 - optlen); 1001 + case SOL_ICMPV6: 1002 + if (inet_sk(sk)->inet_num != IPPROTO_ICMPV6) 1003 + return -EOPNOTSUPP; 1004 + return rawv6_seticmpfilter(sk, level, optname, optval, optlen); 1005 + case SOL_IPV6: 1006 + if (optname == IPV6_CHECKSUM) 1007 + break; 1008 + default: 1009 + return ipv6_setsockopt(sk, level, optname, optval, optlen); 1013 1010 } 1014 1011 1015 1012 return do_rawv6_setsockopt(sk, level, optname, optval, optlen); ··· 1072 1075 static int rawv6_getsockopt(struct sock *sk, int level, int optname, 1073 1076 char __user *optval, int __user *optlen) 1074 1077 { 1075 - switch(level) { 1076 - case SOL_RAW: 1077 - break; 1078 + switch (level) { 1079 + case SOL_RAW: 1080 + break; 1078 1081 1079 - case SOL_ICMPV6: 1080 - if (inet_sk(sk)->inet_num != IPPROTO_ICMPV6) 1081 - return -EOPNOTSUPP; 1082 - return rawv6_geticmpfilter(sk, level, optname, optval, 1083 - optlen); 1084 - case SOL_IPV6: 1085 - if (optname == IPV6_CHECKSUM) 1086 - break; 1087 - default: 1088 - return ipv6_getsockopt(sk, level, optname, optval, 1089 - optlen); 1082 + case SOL_ICMPV6: 1083 + if (inet_sk(sk)->inet_num != IPPROTO_ICMPV6) 1084 + return -EOPNOTSUPP; 1085 + return rawv6_geticmpfilter(sk, level, optname, optval, optlen); 1086 + case SOL_IPV6: 1087 + if (optname == IPV6_CHECKSUM) 1088 + break; 1089 + default: 1090 + return ipv6_getsockopt(sk, level, optname, optval, optlen); 1090 1091 } 1091 1092 1092 1093 return do_rawv6_getsockopt(sk, level, optname, optval, optlen); ··· 1114 1119 1115 1120 static int rawv6_ioctl(struct sock *sk, int cmd, unsigned long arg) 1116 1121 { 1117 - switch(cmd) { 1118 - case SIOCOUTQ: 1119 - { 1120 - int amount = sk_wmem_alloc_get(sk); 1122 + switch (cmd) { 1123 + case SIOCOUTQ: { 1124 + int amount = sk_wmem_alloc_get(sk); 1121 1125 1122 - return put_user(amount, (int __user *)arg); 1123 - } 1124 - case SIOCINQ: 1125 - { 1126 - struct sk_buff *skb; 1127 - int amount = 0; 1126 + return put_user(amount, (int __user *)arg); 1127 + } 1128 + case SIOCINQ: { 1129 + struct sk_buff *skb; 1130 + int amount = 0; 1128 1131 1129 - spin_lock_bh(&sk->sk_receive_queue.lock); 1130 - skb = skb_peek(&sk->sk_receive_queue); 1131 - if (skb != NULL) 1132 - amount = skb->tail - skb->transport_header; 1133 - spin_unlock_bh(&sk->sk_receive_queue.lock); 1134 - return put_user(amount, (int __user *)arg); 1135 - } 1132 + spin_lock_bh(&sk->sk_receive_queue.lock); 1133 + skb = skb_peek(&sk->sk_receive_queue); 1134 + if (skb != NULL) 1135 + amount = skb->tail - skb->transport_header; 1136 + spin_unlock_bh(&sk->sk_receive_queue.lock); 1137 + return put_user(amount, (int __user *)arg); 1138 + } 1136 1139 1137 - default: 1140 + default: 1138 1141 #ifdef CONFIG_IPV6_MROUTE 1139 - return ip6mr_ioctl(sk, cmd, (void __user *)arg); 1142 + return ip6mr_ioctl(sk, cmd, (void __user *)arg); 1140 1143 #else 1141 - return -ENOIOCTLCMD; 1144 + return -ENOIOCTLCMD; 1142 1145 #endif 1143 1146 } 1144 1147 }