in*_control: Drop error variable to return directly

[Klemens Nanni]

On Wed, Apr 19, 2023 at 05:59:24PM +0000, Klemens Nanni wrote:
> No unlock except for the NULL case, but this lets us clean up the callers
> a little.

In, here's the cleanup.

OK?

Index: netinet6/in6.c
===================================================================
RCS file: /cvs/src/sys/netinet6/in6.c,v
retrieving revision 1.260
diff -u -p -r1.260 in6.c
--- netinet6/in6.c      19 Apr 2023 20:03:52 -0000      1.260
+++ netinet6/in6.c      19 Apr 2023 20:06:02 -0000
@@ -197,7 +197,6 @@ int
 in6_control(struct socket *so, u_long cmd, caddr_t data, struct ifnet *ifp)
 {
        int privileged;
-       int error;
 
        privileged = 0;
        if ((so->so_state & SS_PRIV) != 0)
@@ -207,15 +206,11 @@ in6_control(struct socket *so, u_long cm
 #ifdef MROUTING
        case SIOCGETSGCNT_IN6:
        case SIOCGETMIFCNT_IN6:
-               error = mrt6_ioctl(so, cmd, data);
-               break;
+               return mrt6_ioctl(so, cmd, data);
 #endif /* MROUTING */
        default:
-               error = in6_ioctl(cmd, data, ifp, privileged);
-               break;
+               return in6_ioctl(cmd, data, ifp, privileged);
        }
-
-       return error;
 }
 
 int
Index: netinet/in.c
===================================================================
RCS file: /cvs/src/sys/netinet/in.c,v
retrieving revision 1.182
diff -u -p -r1.182 in.c
--- netinet/in.c        19 Apr 2023 20:03:51 -0000      1.182
+++ netinet/in.c        19 Apr 2023 20:06:03 -0000
@@ -200,7 +200,6 @@ int
 in_control(struct socket *so, u_long cmd, caddr_t data, struct ifnet *ifp)
 {
        int privileged;
-       int error;
 
        privileged = 0;
        if ((so->so_state & SS_PRIV) != 0)
@@ -210,15 +209,11 @@ in_control(struct socket *so, u_long cmd
 #ifdef MROUTING
        case SIOCGETVIFCNT:
        case SIOCGETSGCNT:
-               error = mrt_ioctl(so, cmd, data);
-               break;
+               return mrt_ioctl(so, cmd, data);
 #endif /* MROUTING */
        default:
-               error = in_ioctl(cmd, data, ifp, privileged);
-               break;
+               return in_ioctl(cmd, data, ifp, privileged);
        }
-
-       return error;
 }
 
 int