Merge commit 'ded10c47f39e' into HEAD

[linux-2.6-microblaze.git] / crypto / algif_aead.c

diff --git a/crypto/algif_aead.c b/crypto/algif_aead.c
index 43c6aa7..21efa78 100644 (file)
--- a/crypto/algif_aead.c
+++ b/crypto/algif_aead.c
@@ -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,