aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
Diffstat (limited to 'net')
-rw-r--r--net/rds/ib_recv.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/net/rds/ib_recv.c b/net/rds/ib_recv.c
index 28bdcdcdbfe9..cd7a6cfcab03 100644
--- a/net/rds/ib_recv.c
+++ b/net/rds/ib_recv.c
@@ -686,7 +686,7 @@ struct rds_ib_ack_state {
686}; 686};
687 687
688static void rds_ib_process_recv(struct rds_connection *conn, 688static void rds_ib_process_recv(struct rds_connection *conn,
689 struct rds_ib_recv_work *recv, u32 byte_len, 689 struct rds_ib_recv_work *recv, u32 data_len,
690 struct rds_ib_ack_state *state) 690 struct rds_ib_ack_state *state)
691{ 691{
692 struct rds_ib_connection *ic = conn->c_transport_data; 692 struct rds_ib_connection *ic = conn->c_transport_data;
@@ -696,9 +696,9 @@ static void rds_ib_process_recv(struct rds_connection *conn,
696 /* XXX shut down the connection if port 0,0 are seen? */ 696 /* XXX shut down the connection if port 0,0 are seen? */
697 697
698 rdsdebug("ic %p ibinc %p recv %p byte len %u\n", ic, ibinc, recv, 698 rdsdebug("ic %p ibinc %p recv %p byte len %u\n", ic, ibinc, recv,
699 byte_len); 699 data_len);
700 700
701 if (byte_len < sizeof(struct rds_header)) { 701 if (data_len < sizeof(struct rds_header)) {
702 rds_ib_conn_error(conn, "incoming message " 702 rds_ib_conn_error(conn, "incoming message "
703 "from %pI4 didn't inclue a " 703 "from %pI4 didn't inclue a "
704 "header, disconnecting and " 704 "header, disconnecting and "
@@ -706,9 +706,9 @@ static void rds_ib_process_recv(struct rds_connection *conn,
706 &conn->c_faddr); 706 &conn->c_faddr);
707 return; 707 return;
708 } 708 }
709 byte_len -= sizeof(struct rds_header); 709 data_len -= sizeof(struct rds_header);
710 710
711 ihdr = rds_ib_get_header(conn, recv, byte_len); 711 ihdr = rds_ib_get_header(conn, recv, data_len);
712 712
713 /* Validate the checksum. */ 713 /* Validate the checksum. */
714 if (!rds_message_verify_checksum(ihdr)) { 714 if (!rds_message_verify_checksum(ihdr)) {
@@ -728,7 +728,7 @@ static void rds_ib_process_recv(struct rds_connection *conn,
728 if (ihdr->h_credit) 728 if (ihdr->h_credit)
729 rds_ib_send_add_credits(conn, ihdr->h_credit); 729 rds_ib_send_add_credits(conn, ihdr->h_credit);
730 730
731 if (ihdr->h_sport == 0 && ihdr->h_dport == 0 && byte_len == 0) { 731 if (ihdr->h_sport == 0 && ihdr->h_dport == 0 && data_len == 0) {
732 /* This is an ACK-only packet. The fact that it gets 732 /* This is an ACK-only packet. The fact that it gets
733 * special treatment here is that historically, ACKs 733 * special treatment here is that historically, ACKs
734 * were rather special beasts. 734 * were rather special beasts.