diff options
author | David S. Miller <davem@sunset.davemloft.net> | 2007-04-26 23:20:21 -0400 |
---|---|---|
committer | David S. Miller <davem@sunset.davemloft.net> | 2007-04-26 23:20:21 -0400 |
commit | 68c708fd5e90f6d178c84bb7e641589eb2842319 (patch) | |
tree | 30dd24e49b9c266c78dfc6b6c02df9164530fe82 | |
parent | 411faf5810cdd0e4f5071a3805d8adb49d120a07 (diff) |
[RXRPC]: Fix pointers passed to bitops.
CC [M] net/rxrpc/ar-input.o
net/rxrpc/ar-input.c: In function ‘rxrpc_fast_process_data’:
net/rxrpc/ar-input.c:171: warning: passing argument 2 of ‘__test_and_set_bit’ from incompatible pointer type
net/rxrpc/ar-input.c:180: warning: passing argument 2 of ‘__clear_bit’ from incompatible pointer type
net/rxrpc/ar-input.c:218: warning: passing argument 2 of ‘__clear_bit’ from incompatible pointer type
Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r-- | net/rxrpc/ar-input.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/net/rxrpc/ar-input.c b/net/rxrpc/ar-input.c index ceb5d619a1d4..91b5bbb003e2 100644 --- a/net/rxrpc/ar-input.c +++ b/net/rxrpc/ar-input.c | |||
@@ -168,7 +168,7 @@ static int rxrpc_fast_process_data(struct rxrpc_call *call, | |||
168 | /* we may already have the packet in the out of sequence queue */ | 168 | /* we may already have the packet in the out of sequence queue */ |
169 | ackbit = seq - (call->rx_data_eaten + 1); | 169 | ackbit = seq - (call->rx_data_eaten + 1); |
170 | ASSERTCMP(ackbit, >=, 0); | 170 | ASSERTCMP(ackbit, >=, 0); |
171 | if (__test_and_set_bit(ackbit, &call->ackr_window)) { | 171 | if (__test_and_set_bit(ackbit, call->ackr_window)) { |
172 | _debug("dup oos #%u [%u,%u]", | 172 | _debug("dup oos #%u [%u,%u]", |
173 | seq, call->rx_data_eaten, call->rx_data_post); | 173 | seq, call->rx_data_eaten, call->rx_data_post); |
174 | ack = RXRPC_ACK_DUPLICATE; | 174 | ack = RXRPC_ACK_DUPLICATE; |
@@ -177,7 +177,7 @@ static int rxrpc_fast_process_data(struct rxrpc_call *call, | |||
177 | 177 | ||
178 | if (seq >= call->ackr_win_top) { | 178 | if (seq >= call->ackr_win_top) { |
179 | _debug("exceed #%u [%u]", seq, call->ackr_win_top); | 179 | _debug("exceed #%u [%u]", seq, call->ackr_win_top); |
180 | __clear_bit(ackbit, &call->ackr_window); | 180 | __clear_bit(ackbit, call->ackr_window); |
181 | ack = RXRPC_ACK_EXCEEDS_WINDOW; | 181 | ack = RXRPC_ACK_EXCEEDS_WINDOW; |
182 | goto discard_and_ack; | 182 | goto discard_and_ack; |
183 | } | 183 | } |
@@ -215,7 +215,7 @@ static int rxrpc_fast_process_data(struct rxrpc_call *call, | |||
215 | ret = rxrpc_queue_rcv_skb(call, skb, false, terminal); | 215 | ret = rxrpc_queue_rcv_skb(call, skb, false, terminal); |
216 | if (ret < 0) { | 216 | if (ret < 0) { |
217 | if (ret == -ENOMEM || ret == -ENOBUFS) { | 217 | if (ret == -ENOMEM || ret == -ENOBUFS) { |
218 | __clear_bit(ackbit, &call->ackr_window); | 218 | __clear_bit(ackbit, call->ackr_window); |
219 | ack = RXRPC_ACK_NOSPACE; | 219 | ack = RXRPC_ACK_NOSPACE; |
220 | goto discard_and_ack; | 220 | goto discard_and_ack; |
221 | } | 221 | } |