aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid S. Miller <davem@sunset.davemloft.net>2007-04-26 20:20:21 -0700
committerDavid S. Miller <davem@sunset.davemloft.net>2007-04-26 20:20:21 -0700
commit68c708fd5e90f6d178c84bb7e641589eb2842319 (patch)
tree30dd24e49b9c266c78dfc6b6c02df9164530fe82
parent[RXRPC]: Remove bogus atomic_* overrides. (diff)
downloadlinux-dev-68c708fd5e90f6d178c84bb7e641589eb2842319.tar.xz
linux-dev-68c708fd5e90f6d178c84bb7e641589eb2842319.zip
[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.c6
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,
/* we may already have the packet in the out of sequence queue */
ackbit = seq - (call->rx_data_eaten + 1);
ASSERTCMP(ackbit, >=, 0);
- if (__test_and_set_bit(ackbit, &call->ackr_window)) {
+ if (__test_and_set_bit(ackbit, call->ackr_window)) {
_debug("dup oos #%u [%u,%u]",
seq, call->rx_data_eaten, call->rx_data_post);
ack = RXRPC_ACK_DUPLICATE;
@@ -177,7 +177,7 @@ static int rxrpc_fast_process_data(struct rxrpc_call *call,
if (seq >= call->ackr_win_top) {
_debug("exceed #%u [%u]", seq, call->ackr_win_top);
- __clear_bit(ackbit, &call->ackr_window);
+ __clear_bit(ackbit, call->ackr_window);
ack = RXRPC_ACK_EXCEEDS_WINDOW;
goto discard_and_ack;
}
@@ -215,7 +215,7 @@ static int rxrpc_fast_process_data(struct rxrpc_call *call,
ret = rxrpc_queue_rcv_skb(call, skb, false, terminal);
if (ret < 0) {
if (ret == -ENOMEM || ret == -ENOBUFS) {
- __clear_bit(ackbit, &call->ackr_window);
+ __clear_bit(ackbit, call->ackr_window);
ack = RXRPC_ACK_NOSPACE;
goto discard_and_ack;
}