mirror/lwip
1
0
Fork 0
mirror of https://github.com/lwip-tcpip/lwip.git synced 2024-12-26 12:13:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

tcp_out: remove CHECKSUM_GEN_TCP case from tcp_send_empty_ack

Browse Source 
CHECKSUM_GEN_TCP support was moved to tcp_output_control_segment
so we can remove usage of tcphdr and the extra set of #if/#endif

This fixes https://travis-ci.org/yarrick/lwip-merged/builds/335348098
This commit is contained in:
Joel Cunningham 2018-01-30 17:35:40 -06:00
parent 0ee7a39594
commit 64a351cbe0
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/core/tcp_out.c
View File

@ -1880,15 +1880,13 @@ tcp_send_empty_ack(struct tcp_pcb *pcb)
err_t err; err_t err;
struct pbuf *p; struct pbuf *p;
u8_t optlen = 0; u8_t optlen = 0;
#if CHECKSUM_GEN_TCP || LWIP_TCP_TIMESTAMPS || LWIP_TCP_SACK_OUT
struct tcp_hdr *tcphdr;
#if LWIP_TCP_TIMESTAMPS || LWIP_TCP_SACK_OUT #if LWIP_TCP_TIMESTAMPS || LWIP_TCP_SACK_OUT
struct tcp_hdr *tcphdr;
u32_t *opts; u32_t *opts;
#if LWIP_TCP_SACK_OUT #if LWIP_TCP_SACK_OUT
u8_t num_sacks; u8_t num_sacks;
#endif /* LWIP_TCP_SACK_OUT */ #endif /* LWIP_TCP_SACK_OUT */
#endif /* LWIP_TCP_TIMESTAMPS || LWIP_TCP_SACK_OUT */ #endif /* LWIP_TCP_TIMESTAMPS || LWIP_TCP_SACK_OUT */
#endif /* CHECKSUM_GEN_TCP || LWIP_TCP_TIMESTAMPS || LWIP_TCP_SACK_OUT */
#if LWIP_TCP_TIMESTAMPS #if LWIP_TCP_TIMESTAMPS
if (pcb->flags & TF_TIMESTAMP) { if (pcb->flags & TF_TIMESTAMP) {
@ -1911,13 +1909,11 @@ tcp_send_empty_ack(struct tcp_pcb *pcb)
return ERR_BUF; return ERR_BUF;
} }
#if CHECKSUM_GEN_TCP || LWIP_TCP_TIMESTAMPS || LWIP_TCP_SACK_OUT
tcphdr = (struct tcp_hdr *)p->payload;
#if LWIP_TCP_TIMESTAMPS || LWIP_TCP_SACK_OUT #if LWIP_TCP_TIMESTAMPS || LWIP_TCP_SACK_OUT
tcphdr = (struct tcp_hdr *)p->payload;
/* cast through void* to get rid of alignment warnings */ /* cast through void* to get rid of alignment warnings */
opts = (u32_t *)(void *)(tcphdr + 1); opts = (u32_t *)(void *)(tcphdr + 1);
#endif /* LWIP_TCP_TIMESTAMPS || LWIP_TCP_SACK_OUT */ #endif /* LWIP_TCP_TIMESTAMPS || LWIP_TCP_SACK_OUT */
#endif /* CHECKSUM_GEN_TCP || LWIP_TCP_TIMESTAMPS || LWIP_TCP_SACK_OUT */
LWIP_DEBUGF(TCP_OUTPUT_DEBUG, LWIP_DEBUGF(TCP_OUTPUT_DEBUG,
("tcp_output: sending ACK for %"U32_F"\n", pcb->rcv_nxt)); ("tcp_output: sending ACK for %"U32_F"\n", pcb->rcv_nxt));