vserver 2.0 rc7

[linux-2.6.git] / net / netrom / nr_out.c

diff --git a/net/netrom/nr_out.c b/net/netrom/nr_out.c
index d36393d..7939ded 100644 (file)
--- a/net/netrom/nr_out.c
+++ b/net/netrom/nr_out.c
@@ -82,7 +82,7 @@ void nr_output(struct sock *sk, struct sk_buff *skb)
  */
 static void nr_send_iframe(struct sock *sk, struct sk_buff *skb)
 {
-       nr_cb *nr = nr_sk(sk);
+       struct nr_sock *nr = nr_sk(sk);
 
        if (skb == NULL)
                return;
@@ -101,7 +101,7 @@ static void nr_send_iframe(struct sock *sk, struct sk_buff *skb)
 void nr_send_nak_frame(struct sock *sk)
 {
        struct sk_buff *skb, *skbn;
-       nr_cb *nr = nr_sk(sk);
+       struct nr_sock *nr = nr_sk(sk);
 
        if ((skb = skb_peek(&nr->ack_queue)) == NULL)
                return;
@@ -125,7 +125,7 @@ void nr_send_nak_frame(struct sock *sk)
 
 void nr_kick(struct sock *sk)
 {
-       nr_cb *nr = nr_sk(sk);
+       struct nr_sock *nr = nr_sk(sk);
        struct sk_buff *skb, *skbn;
        unsigned short start, end;
 
@@ -188,7 +188,7 @@ void nr_kick(struct sock *sk)
 
 void nr_transmit_buffer(struct sock *sk, struct sk_buff *skb)
 {
-       nr_cb *nr = nr_sk(sk);
+       struct nr_sock *nr = nr_sk(sk);
        unsigned char *dptr;
 
        /*
@@ -223,7 +223,7 @@ void nr_transmit_buffer(struct sock *sk, struct sk_buff *skb)
 
 void nr_establish_data_link(struct sock *sk)
 {
-       nr_cb *nr = nr_sk(sk);
+       struct nr_sock *nr = nr_sk(sk);
 
        nr->condition = 0x00;
        nr->n2count   = 0;
@@ -241,7 +241,7 @@ void nr_establish_data_link(struct sock *sk)
  */
 void nr_enquiry_response(struct sock *sk)
 {
-       nr_cb *nr = nr_sk(sk);
+       struct nr_sock *nr = nr_sk(sk);
        int frametype = NR_INFOACK;
 
        if (nr->condition & NR_COND_OWN_RX_BUSY) {
@@ -259,7 +259,7 @@ void nr_enquiry_response(struct sock *sk)
 
 void nr_check_iframes_acked(struct sock *sk, unsigned short nr)
 {
-       nr_cb *nrom = nr_sk(sk);
+       struct nr_sock *nrom = nr_sk(sk);
 
        if (nrom->vs == nr) {
                nr_frames_acked(sk, nr);