Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 68c708fd authored by David S. Miller's avatar David S. Miller
Browse files

[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: default avatarDavid S. Miller <davem@davemloft.net>
parent 411faf58

net/rxrpc/ar-input.c

+3 −3
Original line number Diff line number Diff line
@@ -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;

		}