af_iucv: remove duplicate sock_set_flag

[linux-2.6.git] / net / iucv / af_iucv.c

diff --git a/net/iucv/af_iucv.c b/net/iucv/af_iucv.c
index bada1b9c670bd555fa10833165326492762b3d97..3aebabb158a87d9af522600acef8bb45063d9f1f 100644 (file)
--- a/net/iucv/af_iucv.c
+++ b/net/iucv/af_iucv.c
@@ -428,7 +428,6 @@ static void iucv_sock_close(struct sock *sk)
                break;
 
        default:
-               sock_set_flag(sk, SOCK_ZAPPED);
                /* nothing to do here */
                break;
        }
@@ -536,7 +535,7 @@ void iucv_accept_enqueue(struct sock *parent, struct sock *sk)
        list_add_tail(&iucv_sk(sk)->accept_q, &par->accept_q);
        spin_unlock_irqrestore(&par->accept_q_lock, flags);
        iucv_sk(sk)->parent = parent;
-       parent->sk_ack_backlog++;
+       sk_acceptq_added(parent);
 }
 
 void iucv_accept_unlink(struct sock *sk)
@@ -547,7 +546,7 @@ void iucv_accept_unlink(struct sock *sk)
        spin_lock_irqsave(&par->accept_q_lock, flags);
        list_del_init(&iucv_sk(sk)->accept_q);
        spin_unlock_irqrestore(&par->accept_q_lock, flags);
-       iucv_sk(sk)->parent->sk_ack_backlog--;
+       sk_acceptq_removed(iucv_sk(sk)->parent);
        iucv_sk(sk)->parent = NULL;
        sock_put(sk);
 }
@@ -1715,7 +1714,7 @@ static const struct proto_ops iucv_sock_ops = {
        .getsockopt     = iucv_sock_getsockopt,
 };
 
-static struct net_proto_family iucv_sock_family_ops = {
+static const struct net_proto_family iucv_sock_family_ops = {
        .family = AF_IUCV,
        .owner  = THIS_MODULE,
        .create = iucv_sock_create,