bartoszek/zephyr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

net: tcp: Remove unused recv_ack field from TCP context

Browse Source 
This value is never set (always zero), so it's safe to remove it from
the net_tcp struct.

Change-Id: Ie4c1d90204a9834f2223b09828af42ee101bd045
Signed-off-by: Leandro Pereira <leandro.pereira@intel.com>
This commit is contained in:
Leandro Pereira 2017-01-12 14:47:21 -08:00 committed by Jukka Rissanen
parent 5de6d084a9
commit 9a558c2aaa
4 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
subsys/net/ip/net_context.c
View File

@ -1281,7 +1281,6 @@ static enum net_verdict tcp_syn_rcvd(struct net_conn *conn,
goto reset;
}
new_context->tcp->recv_ack = context->tcp->recv_ack;
new_context->tcp->recv_max_ack = context->tcp->recv_max_ack;
new_context->tcp->send_seq = context->tcp->send_seq;
new_context->tcp->send_ack = context->tcp->send_ack;

6
subsys/net/ip/net_shell.c
View File

@ -517,11 +517,11 @@ static void tcp_cb(struct net_tcp *tcp, void *user_data)
{
int *count = user_data;
printf("%p\t%-12s\t%-10u%-10u%-11u%-11u%-11u%-5u\n",
printf("%p\t%-12s\t%-10u%-10u%-11u%-11u%-5u\n",
tcp, net_tcp_state_str(tcp->state),
ntohs(net_sin6_ptr(&tcp->context->local)->sin6_port),
ntohs(net_sin6(&tcp->context->remote)->sin6_port),
tcp->recv_ack, tcp->send_seq, tcp->send_ack, tcp->recv_mss);
tcp->send_seq, tcp->send_ack, tcp->recv_mss);
(*count)++;
}
@ -546,7 +546,7 @@ static int shell_cmd_conn(int argc, char *argv[])
}
#if defined(CONFIG_NET_TCP)
printf("\nTCP \tState \tSrc port Dst port Recv-Ack "
printf("\nTCP \tState \tSrc port Dst port "
"Send-Seq Send-Ack MSS\n");
count = 0;

3
subsys/net/ip/tcp.c
View File

@ -521,16 +521,15 @@ int net_tcp_prepare_reset(struct net_tcp *tcp,
(tcp->state != NET_TCP_TIME_WAIT)) {
if (tcp->state == NET_TCP_SYN_RCVD) {
/* Send the reset segment with acknowledgment. */
segment.seq = 0;
segment.ack = tcp->send_ack;
segment.flags = NET_TCP_RST | NET_TCP_ACK;
} else {
/* Send the reset segment without acknowledgment. */
segment.seq = tcp->recv_ack;
segment.ack = 0;
segment.flags = NET_TCP_RST;
}
segment.seq = 0;
segment.src_addr = &tcp->context->local;
segment.dst_addr = remote;
segment.wnd = 0;

3
subsys/net/ip/tcp.h
View File

@ -113,9 +113,6 @@ struct net_tcp {
/** List pointer used for TCP retransmit buffering */
sys_slist_t sent_list;
/** Highest acknowledged number of sent segments. */
uint32_t recv_ack;
/** Max acknowledgment. */
uint32_t recv_max_ack;