vserver 2.0 rc7

[linux-2.6.git] / net / x25 / x25_subr.c

diff --git a/net/x25/x25_subr.c b/net/x25/x25_subr.c
index fd9b130..183fea3 100644 (file)
--- a/net/x25/x25_subr.c
+++ b/net/x25/x25_subr.c
@@ -33,7 +33,7 @@
  */
 void x25_clear_queues(struct sock *sk)
 {
-       struct x25_opt *x25 = x25_sk(sk);
+       struct x25_sock *x25 = x25_sk(sk);
 
        skb_queue_purge(&sk->sk_write_queue);
        skb_queue_purge(&x25->ack_queue);
@@ -51,7 +51,7 @@ void x25_clear_queues(struct sock *sk)
 void x25_frames_acked(struct sock *sk, unsigned short nr)
 {
        struct sk_buff *skb;
-       struct x25_opt *x25 = x25_sk(sk);
+       struct x25_sock *x25 = x25_sk(sk);
        int modulus = x25->neighbour->extended ? X25_EMODULUS : X25_SMODULUS;
 
        /*
@@ -89,7 +89,7 @@ void x25_requeue_frames(struct sock *sk)
  */
 int x25_validate_nr(struct sock *sk, unsigned short nr)
 {
-       struct x25_opt *x25 = x25_sk(sk);
+       struct x25_sock *x25 = x25_sk(sk);
        unsigned short vc = x25->va;
        int modulus = x25->neighbour->extended ? X25_EMODULUS : X25_SMODULUS;
 
@@ -108,7 +108,7 @@ int x25_validate_nr(struct sock *sk, unsigned short nr)
  */
 void x25_write_internal(struct sock *sk, int frametype)
 {
-       struct x25_opt *x25 = x25_sk(sk);
+       struct x25_sock *x25 = x25_sk(sk);
        struct sk_buff *skb;
        unsigned char  *dptr;
        unsigned char  facilities[X25_MAX_FAC_LEN];
@@ -248,7 +248,7 @@ void x25_write_internal(struct sock *sk, int frametype)
 int x25_decode(struct sock *sk, struct sk_buff *skb, int *ns, int *nr, int *q,
               int *d, int *m)
 {
-       struct x25_opt *x25 = x25_sk(sk);
+       struct x25_sock *x25 = x25_sk(sk);
        unsigned char *frame = skb->data;
 
        *ns = *nr = *q = *d = *m = 0;
@@ -315,7 +315,7 @@ int x25_decode(struct sock *sk, struct sk_buff *skb, int *ns, int *nr, int *q,
 void x25_disconnect(struct sock *sk, int reason, unsigned char cause,
                    unsigned char diagnostic)
 {
-       struct x25_opt *x25 = x25_sk(sk);
+       struct x25_sock *x25 = x25_sk(sk);
 
        x25_clear_queues(sk);
        x25_stop_timer(sk);
@@ -342,7 +342,7 @@ void x25_disconnect(struct sock *sk, int reason, unsigned char cause,
  */
 void x25_check_rbuf(struct sock *sk)
 {
-       struct x25_opt *x25 = x25_sk(sk);
+       struct x25_sock *x25 = x25_sk(sk);
 
        if (atomic_read(&sk->sk_rmem_alloc) < (sk->sk_rcvbuf / 2) &&
            (x25->condition & X25_COND_OWN_RX_BUSY)) {