Commit a44d9e72 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by David S. Miller
Browse files

net: make ->{get,set}sockopt in proto_ops optional 



Just check for a NULL method instead of wiring up
sock_no_{get,set}sockopt.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Acked-by: default avatarMarc Kleine-Budde <mkl@pengutronix.de>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 3021ad52

crypto/af_alg.c

+0 −1
Original line number Diff line number Diff line
@@ -335,7 +335,6 @@ static const struct proto_ops alg_proto_ops = { 
	.ioctl		=	sock_no_ioctl,

	.listen		=	sock_no_listen,

	.shutdown	=	sock_no_shutdown,

	.getsockopt	=	sock_no_getsockopt,

	.mmap		=	sock_no_mmap,

	.sendpage	=	sock_no_sendpage,

	.sendmsg	=	sock_no_sendmsg,

crypto/algif_aead.c

+0 −4
Original line number Diff line number Diff line
@@ -361,11 +361,9 @@ static struct proto_ops algif_aead_ops = { 
	.ioctl		=	sock_no_ioctl,

	.listen		=	sock_no_listen,

	.shutdown	=	sock_no_shutdown,

	.getsockopt	=	sock_no_getsockopt,

	.mmap		=	sock_no_mmap,

	.bind		=	sock_no_bind,

	.accept		=	sock_no_accept,

	.setsockopt	=	sock_no_setsockopt,



	.release	=	af_alg_release,

	.sendmsg	=	aead_sendmsg,
@@ -454,11 +452,9 @@ static struct proto_ops algif_aead_ops_nokey = { 
	.ioctl		=	sock_no_ioctl,

	.listen		=	sock_no_listen,

	.shutdown	=	sock_no_shutdown,

	.getsockopt	=	sock_no_getsockopt,

	.mmap		=	sock_no_mmap,

	.bind		=	sock_no_bind,

	.accept		=	sock_no_accept,

	.setsockopt	=	sock_no_setsockopt,



	.release	=	af_alg_release,

	.sendmsg	=	aead_sendmsg_nokey,

crypto/algif_hash.c

+0 −4
Original line number Diff line number Diff line
@@ -279,10 +279,8 @@ static struct proto_ops algif_hash_ops = { 
	.ioctl		=	sock_no_ioctl,

	.listen		=	sock_no_listen,

	.shutdown	=	sock_no_shutdown,

	.getsockopt	=	sock_no_getsockopt,

	.mmap		=	sock_no_mmap,

	.bind		=	sock_no_bind,

	.setsockopt	=	sock_no_setsockopt,



	.release	=	af_alg_release,

	.sendmsg	=	hash_sendmsg,
@@ -383,10 +381,8 @@ static struct proto_ops algif_hash_ops_nokey = { 
	.ioctl		=	sock_no_ioctl,

	.listen		=	sock_no_listen,

	.shutdown	=	sock_no_shutdown,

	.getsockopt	=	sock_no_getsockopt,

	.mmap		=	sock_no_mmap,

	.bind		=	sock_no_bind,

	.setsockopt	=	sock_no_setsockopt,



	.release	=	af_alg_release,

	.sendmsg	=	hash_sendmsg_nokey,

crypto/algif_rng.c

+0 −2
Original line number Diff line number Diff line
@@ -101,11 +101,9 @@ static struct proto_ops algif_rng_ops = { 
	.ioctl		=	sock_no_ioctl,

	.listen		=	sock_no_listen,

	.shutdown	=	sock_no_shutdown,

	.getsockopt	=	sock_no_getsockopt,

	.mmap		=	sock_no_mmap,

	.bind		=	sock_no_bind,

	.accept		=	sock_no_accept,

	.setsockopt	=	sock_no_setsockopt,

	.sendmsg	=	sock_no_sendmsg,

	.sendpage	=	sock_no_sendpage,

crypto/algif_skcipher.c

+0 −4
Original line number Diff line number Diff line
@@ -188,11 +188,9 @@ static struct proto_ops algif_skcipher_ops = { 
	.ioctl		=	sock_no_ioctl,

	.listen		=	sock_no_listen,

	.shutdown	=	sock_no_shutdown,

	.getsockopt	=	sock_no_getsockopt,

	.mmap		=	sock_no_mmap,

	.bind		=	sock_no_bind,

	.accept		=	sock_no_accept,

	.setsockopt	=	sock_no_setsockopt,



	.release	=	af_alg_release,

	.sendmsg	=	skcipher_sendmsg,
@@ -281,11 +279,9 @@ static struct proto_ops algif_skcipher_ops_nokey = { 
	.ioctl		=	sock_no_ioctl,

	.listen		=	sock_no_listen,

	.shutdown	=	sock_no_shutdown,

	.getsockopt	=	sock_no_getsockopt,

	.mmap		=	sock_no_mmap,

	.bind		=	sock_no_bind,

	.accept		=	sock_no_accept,

	.setsockopt	=	sock_no_setsockopt,



	.release	=	af_alg_release,

	.sendmsg	=	skcipher_sendmsg_nokey,