[src/trunk]: src/sys/kern If the compat code successfully handled an option, ...

[pgoyette <pgoyette%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/ab035d938d45
branches:  trunk
changeset: 998315:ab035d938d45
user:      pgoyette <pgoyette%NetBSD.org@localhost>
date:      Mon Apr 15 03:58:29 2019 +0000

description:
If the compat code successfully handled an option, don't return an error.

diffstat:

 sys/kern/uipc_socket.c |  6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diffs (27 lines):

diff -r 887f0d071cbe -r ab035d938d45 sys/kern/uipc_socket.c
--- a/sys/kern/uipc_socket.c    Mon Apr 15 02:35:28 2019 +0000
+++ b/sys/kern/uipc_socket.c    Mon Apr 15 03:58:29 2019 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: uipc_socket.c,v 1.276 2019/04/15 02:35:28 pgoyette Exp $       */
+/*     $NetBSD: uipc_socket.c,v 1.277 2019/04/15 03:58:29 pgoyette Exp $       */
 
 /*
  * Copyright (c) 2002, 2007, 2008, 2009 The NetBSD Foundation, Inc.
@@ -71,7 +71,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uipc_socket.c,v 1.276 2019/04/15 02:35:28 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uipc_socket.c,v 1.277 2019/04/15 03:58:29 pgoyette Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_compat_netbsd.h"
@@ -1864,6 +1864,8 @@
                break;
 
        default:
+               if (error == 0)
+                       break;
                solock(so);
                error = ENOPROTOOPT;
                break;