vserver 2.0 rc7

[linux-2.6.git] / drivers / atm / atmtcp.c

diff --git a/drivers/atm/atmtcp.c b/drivers/atm/atmtcp.c
index 436b83a..f2f01cb 100644 (file)
--- a/drivers/atm/atmtcp.c
+++ b/drivers/atm/atmtcp.c
@@ -67,7 +67,7 @@ static int atmtcp_send_control(struct atm_vcc *vcc,int type,
        *(struct atm_vcc **) &new_msg->vcc = vcc;
        old_test = test_bit(flag,&vcc->flags);
        out_vcc->push(out_vcc,skb);
-       add_wait_queue(vcc->sk->sk_sleep, &wait);
+       add_wait_queue(sk_atm(vcc)->sk_sleep, &wait);
        while (test_bit(flag,&vcc->flags) == old_test) {
                mb();
                out_vcc = PRIV(vcc->dev) ? PRIV(vcc->dev)->vcc : NULL;
@@ -79,7 +79,7 @@ static int atmtcp_send_control(struct atm_vcc *vcc,int type,
                schedule();
        }
        set_current_state(TASK_RUNNING);
-       remove_wait_queue(vcc->sk->sk_sleep, &wait);
+       remove_wait_queue(sk_atm(vcc)->sk_sleep, &wait);
        return error;
 }
 
@@ -91,7 +91,7 @@ static int atmtcp_recv_control(const struct atmtcp_control *msg)
        vcc->vpi = msg->addr.sap_addr.vpi;
        vcc->vci = msg->addr.sap_addr.vci;
        vcc->qos = msg->qos;
-       vcc->sk->sk_err = -msg->result;
+       sk_atm(vcc)->sk_err = -msg->result;
        switch (msg->type) {
            case ATMTCP_CTRL_OPEN:
                change_bit(ATM_VF_READY,&vcc->flags);
@@ -104,7 +104,7 @@ static int atmtcp_recv_control(const struct atmtcp_control *msg)
                    msg->type);
                return -EINVAL;
        }
-       wake_up(vcc->sk->sk_sleep);
+       wake_up(sk_atm(vcc)->sk_sleep);
        return 0;
 }
 
@@ -135,7 +135,7 @@ static int atmtcp_v_open(struct atm_vcc *vcc)
        clear_bit(ATM_VF_READY,&vcc->flags); /* just in case ... */
        error = atmtcp_send_control(vcc,ATMTCP_CTRL_OPEN,&msg,ATM_VF_READY);
        if (error) return error;
-       return -vcc->sk->sk_err;
+       return -sk_atm(vcc)->sk_err;
 }
 
 
@@ -267,7 +267,7 @@ static void atmtcp_c_close(struct atm_vcc *vcc)
                        walk = atm_sk(s);
                        if (walk->dev != atmtcp_dev)
                                continue;
-                       wake_up(walk->sk->sk_sleep);
+                       wake_up(s->sk_sleep);
                }
        }
        read_unlock(&vcc_sklist_lock);
@@ -417,7 +417,7 @@ static int atmtcp_attach(struct atm_vcc *vcc,int itf)
        }
        PRIV(dev)->vcc = vcc;
        vcc->dev = &atmtcp_control_dev;
-       vcc_insert_socket(vcc->sk);
+       vcc_insert_socket(sk_atm(vcc));
        set_bit(ATM_VF_META,&vcc->flags);
        set_bit(ATM_VF_READY,&vcc->flags);
        vcc->dev_data = dev;