Revert "sctp: add bpf_bypass_getsockopt proto callback"

This reverts commit b190ced50a which is
commit 2598619e01 upstream.

It breaks the Android abi.  If it is required in the future, it can come
back in an abi-safe way.

Bug: 161946584
Change-Id: Idc0dcb0bd8bec4f81b6a66e99f68b724558a1a73
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>

net/sctp/socket.c

@@ -8044,22 +8044,6 @@ static int sctp_getsockopt(struct sock *sk, int level, int optname,
 	return retval;
 }
 
-static bool sctp_bpf_bypass_getsockopt(int level, int optname)
-{
-	if (level == SOL_SCTP) {
-		switch (optname) {
-		case SCTP_SOCKOPT_PEELOFF:
-		case SCTP_SOCKOPT_PEELOFF_FLAGS:
-		case SCTP_SOCKOPT_CONNECTX3:
-			return true;
-		default:
-			return false;
-		}
-	}
-
-	return false;
-}
-
 static int sctp_hash(struct sock *sk)
 {
 	/* STUB */
@@ -9428,7 +9412,6 @@ struct proto sctp_prot = {
 	.shutdown    =	sctp_shutdown,
 	.setsockopt  =	sctp_setsockopt,
 	.getsockopt  =	sctp_getsockopt,
-	.bpf_bypass_getsockopt	= sctp_bpf_bypass_getsockopt,
 	.sendmsg     =	sctp_sendmsg,
 	.recvmsg     =	sctp_recvmsg,
 	.bind        =	sctp_bind,
@@ -9481,7 +9464,6 @@ struct proto sctpv6_prot = {
 	.shutdown	= sctp_shutdown,
 	.setsockopt	= sctp_setsockopt,
 	.getsockopt	= sctp_getsockopt,
-	.bpf_bypass_getsockopt	= sctp_bpf_bypass_getsockopt,
 	.sendmsg	= sctp_sendmsg,
 	.recvmsg	= sctp_recvmsg,
 	.bind		= sctp_bind,