diff options
| author | David S. Miller <davem@sunset.davemloft.net> | 2005-11-17 18:17:42 -0500 |
|---|---|---|
| committer | David S. Miller <davem@sunset.davemloft.net> | 2005-11-17 18:17:42 -0500 |
| commit | 381998241fd1fc635596f4e8ae835f0d64ca1ba2 (patch) | |
| tree | 7e480e6ddba0144fc6029adf4a66fa00f72019bd | |
| parent | 2fce76afdb067fa3e7f8ee33c9fe366bd65887ea (diff) | |
[LLC]: Fix compiler warnings introduced by TX window scaling changes.
Noticed by Olaf Hering.
The comparisons want a u8 here (the data type on the left-hand branch
is a u8 structure member, and the constant on the right-hand branch is
"~((u8) 128)"), but C turns it into an integer so we get:
net/llc/llc_c_ac.c: In function `llc_conn_ac_inc_npta_value':
net/llc/llc_c_ac.c:998: warning: comparison is always true due to limited range of data type
net/llc/llc_c_ac.c:999: warning: large integer implicitly truncated to unsigned type
Fix this up by explicitly recasting the right-hand branch constant
into a "u8" once more.
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | net/llc/llc_c_ac.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/net/llc/llc_c_ac.c b/net/llc/llc_c_ac.c index 91fb6bc1b116..8169f24ed33e 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) | |||
| 995 | llc->dec_step = 0; | 995 | llc->dec_step = 0; |
| 996 | llc->dec_cntr = llc->inc_cntr = 2; | 996 | llc->dec_cntr = llc->inc_cntr = 2; |
| 997 | ++llc->npta; | 997 | ++llc->npta; |
| 998 | if (llc->npta > ~LLC_2_SEQ_NBR_MODULO) | 998 | if (llc->npta > (u8) ~LLC_2_SEQ_NBR_MODULO) |
| 999 | llc->npta = ~LLC_2_SEQ_NBR_MODULO ; | 999 | llc->npta = (u8) ~LLC_2_SEQ_NBR_MODULO; |
| 1000 | } else | 1000 | } else |
| 1001 | --llc->inc_cntr; | 1001 | --llc->inc_cntr; |
| 1002 | return 0; | 1002 | return 0; |
| @@ -1086,8 +1086,8 @@ int llc_conn_ac_inc_tx_win_size(struct sock *sk, struct sk_buff *skb) | |||
| 1086 | struct llc_sock *llc = llc_sk(sk); | 1086 | struct llc_sock *llc = llc_sk(sk); |
| 1087 | 1087 | ||
| 1088 | llc->k += 1; | 1088 | llc->k += 1; |
| 1089 | if (llc->k > ~LLC_2_SEQ_NBR_MODULO) | 1089 | if (llc->k > (u8) ~LLC_2_SEQ_NBR_MODULO) |
| 1090 | llc->k = ~LLC_2_SEQ_NBR_MODULO ; | 1090 | llc->k = (u8) ~LLC_2_SEQ_NBR_MODULO; |
| 1091 | return 0; | 1091 | return 0; |
| 1092 | } | 1092 | } |
| 1093 | 1093 | ||
