Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 214444
b: refs/heads/master
c: 671202f
h: refs/heads/master
v: v3
  • Loading branch information
Zach Brown authored and Andy Grover committed Sep 9, 2010
1 parent ddeff1a commit 83422f7
Show file tree
Hide file tree
Showing 3 changed files with 1 addition and 31 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 037f18a3074753991656189a091a5fa371999107
refs/heads/master: 671202f3491cccdb267f88ad59ba0635aeb2a22e
1 change: 0 additions & 1 deletion trunk/net/rds/rds.h
Original file line number Diff line number Diff line change
Expand Up @@ -724,7 +724,6 @@ void rds_send_drop_to(struct rds_sock *rs, struct sockaddr_in *dest);
typedef int (*is_acked_func)(struct rds_message *rm, uint64_t ack);
void rds_send_drop_acked(struct rds_connection *conn, u64 ack,
is_acked_func is_acked);
int rds_send_acked_before(struct rds_connection *conn, u64 seq);
void rds_send_remove_from_sock(struct list_head *messages, int status);
int rds_send_pong(struct rds_connection *conn, __be16 dport);
struct rds_message *rds_send_get_message(struct rds_connection *,
Expand Down
29 changes: 0 additions & 29 deletions trunk/net/rds/send.c
Original file line number Diff line number Diff line change
Expand Up @@ -404,35 +404,6 @@ static inline int rds_send_is_acked(struct rds_message *rm, u64 ack,
return be64_to_cpu(rm->m_inc.i_hdr.h_sequence) <= ack;
}

/*
* Returns true if there are no messages on the send and retransmit queues
* which have a sequence number greater than or equal to the given sequence
* number.
*/
int rds_send_acked_before(struct rds_connection *conn, u64 seq)
{
struct rds_message *rm, *tmp;
int ret = 1;

spin_lock(&conn->c_lock);

list_for_each_entry_safe(rm, tmp, &conn->c_retrans, m_conn_item) {
if (be64_to_cpu(rm->m_inc.i_hdr.h_sequence) < seq)
ret = 0;
break;
}

list_for_each_entry_safe(rm, tmp, &conn->c_send_queue, m_conn_item) {
if (be64_to_cpu(rm->m_inc.i_hdr.h_sequence) < seq)
ret = 0;
break;
}

spin_unlock(&conn->c_lock);

return ret;
}

/*
* This is pretty similar to what happens below in the ACK
* handling code - except that we call here as soon as we get
Expand Down

0 comments on commit 83422f7

Please sign in to comment.