Browse Source

net: ipmr: make ip_mroute_getsockopt more understandable

Use a switch to determine if optname is correct and set val accordingly.
This produces a much more straight-forward and readable code.

Signed-off-by: Nikolay Aleksandrov <nikolay@cumulusnetworks.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Nikolay Aleksandrov 9 years ago
parent
commit
fe9ef3ce39
1 changed files with 14 additions and 14 deletions
  1. 14 14
      net/ipv4/ipmr.c

+ 14 - 14
net/ipv4/ipmr.c

@@ -1443,29 +1443,29 @@ int ip_mroute_getsockopt(struct sock *sk, int optname, char __user *optval, int
 	if (!mrt)
 	if (!mrt)
 		return -ENOENT;
 		return -ENOENT;
 
 
-	if (optname != MRT_VERSION &&
-	   optname != MRT_PIM &&
-	   optname != MRT_ASSERT)
+	switch (optname) {
+	case MRT_VERSION:
+		val = 0x0305;
+		break;
+	case MRT_PIM:
+		if (!pimsm_enabled())
+			return -ENOPROTOOPT;
+		val = mrt->mroute_do_pim;
+		break;
+	case MRT_ASSERT:
+		val = mrt->mroute_do_assert;
+		break;
+	default:
 		return -ENOPROTOOPT;
 		return -ENOPROTOOPT;
+	}
 
 
 	if (get_user(olr, optlen))
 	if (get_user(olr, optlen))
 		return -EFAULT;
 		return -EFAULT;
-
 	olr = min_t(unsigned int, olr, sizeof(int));
 	olr = min_t(unsigned int, olr, sizeof(int));
 	if (olr < 0)
 	if (olr < 0)
 		return -EINVAL;
 		return -EINVAL;
-
 	if (put_user(olr, optlen))
 	if (put_user(olr, optlen))
 		return -EFAULT;
 		return -EFAULT;
-	if (optname == MRT_VERSION) {
-		val = 0x0305;
-	} else if (optname == MRT_PIM) {
-		if (!pimsm_enabled())
-			return -ENOPROTOOPT;
-		val = mrt->mroute_do_pim;
-	} else {
-		val = mrt->mroute_do_assert;
-	}
 	if (copy_to_user(optval, &val, olr))
 	if (copy_to_user(optval, &val, olr))
 		return -EFAULT;
 		return -EFAULT;
 	return 0;
 	return 0;