aboutsummaryrefslogtreecommitdiff
path: root/net/llc
diff options
context:
space:
mode:
authorKyle McMartin <kyle@parisc-linux.org>2005-11-18 16:39:20 -0500
committerKyle McMartin <kyle@parisc-linux.org>2005-11-18 16:39:20 -0500
commit2161558fa5bebfeb272493ae91e836b497029023 (patch)
tree16304f91757243626d74e65063ee7224cacbf797 /net/llc
parente670dfb9a4f9e136da44db167da75b2365f7cebb (diff)
parente67b23c71cb9ee02d65a74c3858716ba2dedd554 (diff)
Merge branch 'master'
Diffstat (limited to 'net/llc')
-rw-r--r--net/llc/llc_c_ac.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/net/llc/llc_c_ac.c b/net/llc/llc_c_ac.c
index 91fb6bc1b11..8169f24ed33 100644
--- a/net/llc/llc_c_ac.c
+++ b/net/llc/llc_c_ac.c
@@ -995,8 +995,8 @@ static int llc_conn_ac_inc_npta_value(struct sock *sk, struct sk_buff *skb)
llc->dec_step = 0;
llc->dec_cntr = llc->inc_cntr = 2;
++llc->npta;
- if (llc->npta > ~LLC_2_SEQ_NBR_MODULO)
- llc->npta = ~LLC_2_SEQ_NBR_MODULO ;
+ if (llc->npta > (u8) ~LLC_2_SEQ_NBR_MODULO)
+ llc->npta = (u8) ~LLC_2_SEQ_NBR_MODULO;
} else
--llc->inc_cntr;
return 0;
@@ -1086,8 +1086,8 @@ int llc_conn_ac_inc_tx_win_size(struct sock *sk, struct sk_buff *skb)
struct llc_sock *llc = llc_sk(sk);
llc->k += 1;
- if (llc->k > ~LLC_2_SEQ_NBR_MODULO)
- llc->k = ~LLC_2_SEQ_NBR_MODULO ;
+ if (llc->k > (u8) ~LLC_2_SEQ_NBR_MODULO)
+ llc->k = (u8) ~LLC_2_SEQ_NBR_MODULO;
return 0;
}