vserver 2.0 rc7

[linux-2.6.git] / net / llc / llc_c_ac.c

diff --git a/net/llc/llc_c_ac.c b/net/llc/llc_c_ac.c
index 6d1eefa..b218be4 100644 (file)
--- a/net/llc/llc_c_ac.c
+++ b/net/llc/llc_c_ac.c
@@ -44,7 +44,7 @@ static int llc_conn_ac_set_p_flag_1(struct sock *sk, struct sk_buff *skb);
 
 int llc_conn_ac_clear_remote_busy(struct sock *sk, struct sk_buff *skb)
 {
-       struct llc_opt *llc = llc_sk(sk);
+       struct llc_sock *llc = llc_sk(sk);
 
        if (llc->remote_busy_flag) {
                u8 nr;
@@ -68,7 +68,7 @@ int llc_conn_ac_conn_ind(struct sock *sk, struct sk_buff *skb)
        sap = llc_sap_find(dsap);
        if (sap) {
                struct llc_conn_state_ev *ev = llc_conn_ev(skb);
-               struct llc_opt *llc = llc_sk(sk);
+               struct llc_sock *llc = llc_sk(sk);
 
                llc_pdu_decode_sa(skb, llc->daddr.mac);
                llc_pdu_decode_da(skb, llc->laddr.mac);
@@ -146,7 +146,7 @@ int llc_conn_ac_rst_ind(struct sock *sk, struct sk_buff *skb)
        int rc = 1;
        struct llc_conn_state_ev *ev = llc_conn_ev(skb);
        struct llc_pdu_un *pdu = llc_pdu_un_hdr(skb);
-       struct llc_opt *llc = llc_sk(sk);
+       struct llc_sock *llc = llc_sk(sk);
 
        switch (ev->type) {
        case LLC_CONN_EV_TYPE_PDU:
@@ -207,7 +207,7 @@ int llc_conn_ac_clear_remote_busy_if_f_eq_1(struct sock *sk,
 int llc_conn_ac_stop_rej_tmr_if_data_flag_eq_2(struct sock *sk,
                                               struct sk_buff *skb)
 {
-       struct llc_opt *llc = llc_sk(sk);
+       struct llc_sock *llc = llc_sk(sk);
 
        if (llc->data_flag == 2)
                del_timer(&llc->rej_sent_timer.timer);
@@ -220,7 +220,7 @@ int llc_conn_ac_send_disc_cmd_p_set_x(struct sock *sk, struct sk_buff *skb)
        struct sk_buff *nskb = llc_alloc_frame();
 
        if (nskb) {
-               struct llc_opt *llc = llc_sk(sk);
+               struct llc_sock *llc = llc_sk(sk);
                struct llc_sap *sap = llc->sap;
 
                nskb->dev = llc->dev;
@@ -246,7 +246,7 @@ int llc_conn_ac_send_dm_rsp_f_set_p(struct sock *sk, struct sk_buff *skb)
        struct sk_buff *nskb = llc_alloc_frame();
 
        if (nskb) {
-               struct llc_opt *llc = llc_sk(sk);
+               struct llc_sock *llc = llc_sk(sk);
                struct llc_sap *sap = llc->sap;
                u8 f_bit;
 
@@ -273,7 +273,7 @@ int llc_conn_ac_send_dm_rsp_f_set_1(struct sock *sk, struct sk_buff *skb)
        struct sk_buff *nskb = llc_alloc_frame();
 
        if (nskb) {
-               struct llc_opt *llc = llc_sk(sk);
+               struct llc_sock *llc = llc_sk(sk);
                struct llc_sap *sap = llc->sap;
                u8 f_bit = 1;
 
@@ -299,7 +299,7 @@ int llc_conn_ac_send_frmr_rsp_f_set_x(struct sock *sk, struct sk_buff *skb)
        int rc = -ENOBUFS;
        struct sk_buff *nskb;
        struct llc_pdu_sn *pdu = llc_pdu_sn_hdr(skb);
-       struct llc_opt *llc = llc_sk(sk);
+       struct llc_sock *llc = llc_sk(sk);
 
        llc->rx_pdu_hdr = *((u32 *)pdu);
        if (LLC_PDU_IS_CMD(pdu))
@@ -334,7 +334,7 @@ int llc_conn_ac_resend_frmr_rsp_f_set_0(struct sock *sk, struct sk_buff *skb)
 
        if (nskb) {
                u8 f_bit = 0;
-               struct llc_opt *llc = llc_sk(sk);
+               struct llc_sock *llc = llc_sk(sk);
                struct llc_sap *sap = llc->sap;
                struct llc_pdu_sn *pdu = (struct llc_pdu_sn *)&llc->rx_pdu_hdr;
 
@@ -364,7 +364,7 @@ int llc_conn_ac_resend_frmr_rsp_f_set_p(struct sock *sk, struct sk_buff *skb)
        llc_pdu_decode_pf_bit(skb, &f_bit);
        nskb = llc_alloc_frame();
        if (nskb) {
-               struct llc_opt *llc = llc_sk(sk);
+               struct llc_sock *llc = llc_sk(sk);
                struct llc_sap *sap = llc->sap;
                struct llc_pdu_sn *pdu = llc_pdu_sn_hdr(skb);
 
@@ -388,7 +388,7 @@ free:
 int llc_conn_ac_send_i_cmd_p_set_1(struct sock *sk, struct sk_buff *skb)
 {
        int rc;
-       struct llc_opt *llc = llc_sk(sk);
+       struct llc_sock *llc = llc_sk(sk);
        struct llc_sap *sap = llc->sap;
 
        llc_pdu_header_init(skb, LLC_PDU_TYPE_I, sap->laddr.lsap,
@@ -405,7 +405,7 @@ int llc_conn_ac_send_i_cmd_p_set_1(struct sock *sk, struct sk_buff *skb)
 static int llc_conn_ac_send_i_cmd_p_set_0(struct sock *sk, struct sk_buff *skb)
 {
        int rc;
-       struct llc_opt *llc = llc_sk(sk);
+       struct llc_sock *llc = llc_sk(sk);
        struct llc_sap *sap = llc->sap;
 
        llc_pdu_header_init(skb, LLC_PDU_TYPE_I, sap->laddr.lsap,
@@ -422,7 +422,7 @@ static int llc_conn_ac_send_i_cmd_p_set_0(struct sock *sk, struct sk_buff *skb)
 int llc_conn_ac_send_i_xxx_x_set_0(struct sock *sk, struct sk_buff *skb)
 {
        int rc;
-       struct llc_opt *llc = llc_sk(sk);
+       struct llc_sock *llc = llc_sk(sk);
        struct llc_sap *sap = llc->sap;
 
        llc_pdu_header_init(skb, LLC_PDU_TYPE_I, sap->laddr.lsap,
@@ -454,7 +454,7 @@ int llc_conn_ac_resend_i_xxx_x_set_0_or_send_rr(struct sock *sk,
        struct sk_buff *nskb = llc_alloc_frame();
 
        if (nskb) {
-               struct llc_opt *llc = llc_sk(sk);
+               struct llc_sock *llc = llc_sk(sk);
                struct llc_sap *sap = llc->sap;
 
                nskb->dev = llc->dev;
@@ -490,7 +490,7 @@ int llc_conn_ac_send_rej_cmd_p_set_1(struct sock *sk, struct sk_buff *skb)
        struct sk_buff *nskb = llc_alloc_frame();
 
        if (nskb) {
-               struct llc_opt *llc = llc_sk(sk);
+               struct llc_sock *llc = llc_sk(sk);
                struct llc_sap *sap = llc->sap;
 
                nskb->dev = llc->dev;
@@ -516,7 +516,7 @@ int llc_conn_ac_send_rej_rsp_f_set_1(struct sock *sk, struct sk_buff *skb)
 
        if (nskb) {
                u8 f_bit = 1;
-               struct llc_opt *llc = llc_sk(sk);
+               struct llc_sock *llc = llc_sk(sk);
                struct llc_sap *sap = llc->sap;
 
                nskb->dev = llc->dev;
@@ -541,7 +541,7 @@ int llc_conn_ac_send_rej_xxx_x_set_0(struct sock *sk, struct sk_buff *skb)
        struct sk_buff *nskb = llc_alloc_frame();
 
        if (nskb) {
-               struct llc_opt *llc = llc_sk(sk);
+               struct llc_sock *llc = llc_sk(sk);
                struct llc_sap *sap = llc->sap;
                u8 f_bit = 0;
 
@@ -567,7 +567,7 @@ int llc_conn_ac_send_rnr_cmd_p_set_1(struct sock *sk, struct sk_buff *skb)
        struct sk_buff *nskb = llc_alloc_frame();
 
        if (nskb) {
-               struct llc_opt *llc = llc_sk(sk);
+               struct llc_sock *llc = llc_sk(sk);
                struct llc_sap *sap = llc->sap;
 
                nskb->dev = llc->dev;
@@ -592,7 +592,7 @@ int llc_conn_ac_send_rnr_rsp_f_set_1(struct sock *sk, struct sk_buff *skb)
        struct sk_buff *nskb = llc_alloc_frame();
 
        if (nskb) {
-               struct llc_opt *llc = llc_sk(sk);
+               struct llc_sock *llc = llc_sk(sk);
                struct llc_sap *sap = llc->sap;
                u8 f_bit = 1;
 
@@ -619,7 +619,7 @@ int llc_conn_ac_send_rnr_xxx_x_set_0(struct sock *sk, struct sk_buff *skb)
 
        if (nskb) {
                u8 f_bit = 0;
-               struct llc_opt *llc = llc_sk(sk);
+               struct llc_sock *llc = llc_sk(sk);
                struct llc_sap *sap = llc->sap;
 
                nskb->dev = llc->dev;
@@ -640,7 +640,7 @@ free:
 
 int llc_conn_ac_set_remote_busy(struct sock *sk, struct sk_buff *skb)
 {
-       struct llc_opt *llc = llc_sk(sk);
+       struct llc_sock *llc = llc_sk(sk);
 
        if (!llc->remote_busy_flag) {
                llc->remote_busy_flag = 1;
@@ -656,7 +656,7 @@ int llc_conn_ac_opt_send_rnr_xxx_x_set_0(struct sock *sk, struct sk_buff *skb)
        struct sk_buff *nskb = llc_alloc_frame();
 
        if (nskb) {
-               struct llc_opt *llc = llc_sk(sk);
+               struct llc_sock *llc = llc_sk(sk);
                struct llc_sap *sap = llc->sap;
 
                nskb->dev = llc->dev;
@@ -681,7 +681,7 @@ int llc_conn_ac_send_rr_cmd_p_set_1(struct sock *sk, struct sk_buff *skb)
        struct sk_buff *nskb = llc_alloc_frame();
 
        if (nskb) {
-               struct llc_opt *llc = llc_sk(sk);
+               struct llc_sock *llc = llc_sk(sk);
                struct llc_sap *sap = llc->sap;
 
                nskb->dev = llc->dev;
@@ -706,7 +706,7 @@ int llc_conn_ac_send_rr_rsp_f_set_1(struct sock *sk, struct sk_buff *skb)
        struct sk_buff *nskb = llc_alloc_frame();
 
        if (nskb) {
-               struct llc_opt *llc = llc_sk(sk);
+               struct llc_sock *llc = llc_sk(sk);
                struct llc_sap *sap = llc->sap;
                u8 f_bit = 1;
 
@@ -732,7 +732,7 @@ int llc_conn_ac_send_ack_rsp_f_set_1(struct sock *sk, struct sk_buff *skb)
        struct sk_buff *nskb = llc_alloc_frame();
 
        if (nskb) {
-               struct llc_opt *llc = llc_sk(sk);
+               struct llc_sock *llc = llc_sk(sk);
                struct llc_sap *sap = llc->sap;
                u8 f_bit = 1;
 
@@ -758,7 +758,7 @@ int llc_conn_ac_send_rr_xxx_x_set_0(struct sock *sk, struct sk_buff *skb)
        struct sk_buff *nskb = llc_alloc_frame();
 
        if (nskb) {
-               struct llc_opt *llc = llc_sk(sk);
+               struct llc_sock *llc = llc_sk(sk);
                struct llc_sap *sap = llc->sap;
 
                nskb->dev = llc->dev;
@@ -783,7 +783,7 @@ int llc_conn_ac_send_ack_xxx_x_set_0(struct sock *sk, struct sk_buff *skb)
        struct sk_buff *nskb = llc_alloc_frame();
 
        if (nskb) {
-               struct llc_opt *llc = llc_sk(sk);
+               struct llc_sock *llc = llc_sk(sk);
                struct llc_sap *sap = llc->sap;
 
                nskb->dev = llc->dev;
@@ -816,7 +816,7 @@ int llc_conn_ac_send_sabme_cmd_p_set_x(struct sock *sk, struct sk_buff *skb)
 {
        int rc = -ENOBUFS;
        struct sk_buff *nskb = llc_alloc_frame();
-       struct llc_opt *llc = llc_sk(sk);
+       struct llc_sock *llc = llc_sk(sk);
 
        if (nskb) {
                struct llc_sap *sap = llc->sap;
@@ -849,7 +849,7 @@ int llc_conn_ac_send_ua_rsp_f_set_p(struct sock *sk, struct sk_buff *skb)
 
        llc_pdu_decode_pf_bit(skb, &f_bit);
        if (nskb) {
-               struct llc_opt *llc = llc_sk(sk);
+               struct llc_sock *llc = llc_sk(sk);
                struct llc_sap *sap = llc->sap;
 
                nskb->dev = llc->dev;
@@ -882,7 +882,7 @@ int llc_conn_ac_set_s_flag_1(struct sock *sk, struct sk_buff *skb)
 
 int llc_conn_ac_start_p_timer(struct sock *sk, struct sk_buff *skb)
 {
-       struct llc_opt *llc = llc_sk(sk);
+       struct llc_sock *llc = llc_sk(sk);
 
        llc_conn_set_p_flag(sk, 1);
        mod_timer(&llc->pf_cycle_timer.timer,
@@ -903,7 +903,7 @@ int llc_conn_ac_start_p_timer(struct sock *sk, struct sk_buff *skb)
 int llc_conn_ac_send_ack_if_needed(struct sock *sk, struct sk_buff *skb)
 {
        u8 pf_bit;
-       struct llc_opt *llc = llc_sk(sk);
+       struct llc_sock *llc = llc_sk(sk);
 
        llc_pdu_decode_pf_bit(skb, &pf_bit);
        llc->ack_pf |= pf_bit & 1;
@@ -950,7 +950,7 @@ static int llc_conn_ac_send_i_rsp_f_set_ackpf(struct sock *sk,
                                              struct sk_buff *skb)
 {
        int rc;
-       struct llc_opt *llc = llc_sk(sk);
+       struct llc_sock *llc = llc_sk(sk);
        struct llc_sap *sap = llc->sap;
 
        llc_pdu_header_init(skb, LLC_PDU_TYPE_I, sap->laddr.lsap,
@@ -976,7 +976,7 @@ static int llc_conn_ac_send_i_rsp_f_set_ackpf(struct sock *sk,
  */
 int llc_conn_ac_send_i_as_ack(struct sock *sk, struct sk_buff *skb)
 {
-       struct llc_opt *llc = llc_sk(sk);
+       struct llc_sock *llc = llc_sk(sk);
 
        if (llc->ack_must_be_send) {
                llc_conn_ac_send_i_rsp_f_set_ackpf(sk, skb);
@@ -1004,7 +1004,7 @@ static int llc_conn_ac_send_rr_rsp_f_set_ackpf(struct sock *sk,
        struct sk_buff *nskb = llc_alloc_frame();
 
        if (nskb) {
-               struct llc_opt *llc = llc_sk(sk);
+               struct llc_sock *llc = llc_sk(sk);
                struct llc_sap *sap = llc->sap;
 
                nskb->dev = llc->dev;
@@ -1035,7 +1035,7 @@ free:
  */
 static int llc_conn_ac_inc_npta_value(struct sock *sk, struct sk_buff *skb)
 {
-       struct llc_opt *llc = llc_sk(sk);
+       struct llc_sock *llc = llc_sk(sk);
 
        if (!llc->inc_cntr) {
                llc->dec_step = 0;
@@ -1058,7 +1058,7 @@ static int llc_conn_ac_inc_npta_value(struct sock *sk, struct sk_buff *skb)
  */
 int llc_conn_ac_adjust_npta_by_rr(struct sock *sk, struct sk_buff *skb)
 {
-       struct llc_opt *llc = llc_sk(sk);
+       struct llc_sock *llc = llc_sk(sk);
 
        if (!llc->connect_step && !llc->remote_busy_flag) {
                if (!llc->dec_step) {
@@ -1084,7 +1084,7 @@ int llc_conn_ac_adjust_npta_by_rr(struct sock *sk, struct sk_buff *skb)
  */
 int llc_conn_ac_adjust_npta_by_rnr(struct sock *sk, struct sk_buff *skb)
 {
-       struct llc_opt *llc = llc_sk(sk);
+       struct llc_sock *llc = llc_sk(sk);
 
        if (llc->remote_busy_flag)
                if (!llc->dec_step) {
@@ -1109,7 +1109,7 @@ int llc_conn_ac_adjust_npta_by_rnr(struct sock *sk, struct sk_buff *skb)
  */
 int llc_conn_ac_dec_tx_win_size(struct sock *sk, struct sk_buff *skb)
 {
-       struct llc_opt *llc = llc_sk(sk);
+       struct llc_sock *llc = llc_sk(sk);
        u8 unacked_pdu = skb_queue_len(&llc->pdu_unack_q);
 
        llc->k -= unacked_pdu;
@@ -1128,7 +1128,7 @@ int llc_conn_ac_dec_tx_win_size(struct sock *sk, struct sk_buff *skb)
  */
 int llc_conn_ac_inc_tx_win_size(struct sock *sk, struct sk_buff *skb)
 {
-       struct llc_opt *llc = llc_sk(sk);
+       struct llc_sock *llc = llc_sk(sk);
 
        llc->k += 1;
        if (llc->k > 128)
@@ -1138,7 +1138,7 @@ int llc_conn_ac_inc_tx_win_size(struct sock *sk, struct sk_buff *skb)
 
 int llc_conn_ac_stop_all_timers(struct sock *sk, struct sk_buff *skb)
 {
-       struct llc_opt *llc = llc_sk(sk);
+       struct llc_sock *llc = llc_sk(sk);
 
        del_timer(&llc->pf_cycle_timer.timer);
        del_timer(&llc->ack_timer.timer);
@@ -1151,7 +1151,7 @@ int llc_conn_ac_stop_all_timers(struct sock *sk, struct sk_buff *skb)
 
 int llc_conn_ac_stop_other_timers(struct sock *sk, struct sk_buff *skb)
 {
-       struct llc_opt *llc = llc_sk(sk);
+       struct llc_sock *llc = llc_sk(sk);
 
        del_timer(&llc->rej_sent_timer.timer);
        del_timer(&llc->pf_cycle_timer.timer);
@@ -1163,7 +1163,7 @@ int llc_conn_ac_stop_other_timers(struct sock *sk, struct sk_buff *skb)
 
 int llc_conn_ac_start_ack_timer(struct sock *sk, struct sk_buff *skb)
 {
-       struct llc_opt *llc = llc_sk(sk);
+       struct llc_sock *llc = llc_sk(sk);
 
        mod_timer(&llc->ack_timer.timer, jiffies + llc->ack_timer.expire * HZ);
        return 0;
@@ -1171,7 +1171,7 @@ int llc_conn_ac_start_ack_timer(struct sock *sk, struct sk_buff *skb)
 
 int llc_conn_ac_start_rej_timer(struct sock *sk, struct sk_buff *skb)
 {
-       struct llc_opt *llc = llc_sk(sk);
+       struct llc_sock *llc = llc_sk(sk);
 
        mod_timer(&llc->rej_sent_timer.timer,
                  jiffies + llc->rej_sent_timer.expire * HZ);
@@ -1181,7 +1181,7 @@ int llc_conn_ac_start_rej_timer(struct sock *sk, struct sk_buff *skb)
 int llc_conn_ac_start_ack_tmr_if_not_running(struct sock *sk,
                                             struct sk_buff *skb)
 {
-       struct llc_opt *llc = llc_sk(sk);
+       struct llc_sock *llc = llc_sk(sk);
 
        if (!timer_pending(&llc->ack_timer.timer))
                mod_timer(&llc->ack_timer.timer,
@@ -1197,7 +1197,7 @@ int llc_conn_ac_stop_ack_timer(struct sock *sk, struct sk_buff *skb)
 
 int llc_conn_ac_stop_p_timer(struct sock *sk, struct sk_buff *skb)
 {
-       struct llc_opt *llc = llc_sk(sk);
+       struct llc_sock *llc = llc_sk(sk);
 
        del_timer(&llc->pf_cycle_timer.timer);
        llc_conn_set_p_flag(sk, 0);
@@ -1215,7 +1215,7 @@ int llc_conn_ac_upd_nr_received(struct sock *sk, struct sk_buff *skb)
        int acked;
        u16 unacked = 0;
        struct llc_pdu_sn *pdu = llc_pdu_sn_hdr(skb);
-       struct llc_opt *llc = llc_sk(sk);
+       struct llc_sock *llc = llc_sk(sk);
 
        llc->last_nr = PDU_SUPV_GET_Nr(pdu);
        acked = llc_conn_remove_acked_pdus(sk, llc->last_nr, &unacked);