diff options
| author | Anthony Liguori <aliguori@us.ibm.com> | 2011-09-29 13:33:47 -0500 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2011-09-29 13:33:47 -0500 |
| commit | 8f440cda08c6df574ad153c3558a81c7d3ad5845 (patch) | |
| tree | 79fbb629879b524dac165cfc76172ebc39e4c99a | |
| parent | 62ec6073cd07b847c296b3a1fa19894293f8155d (diff) | |
| parent | 2b4404326598bec4cb954bfc54fc5e9740a51f7b (diff) | |
Merge remote-tracking branch 'kiszka/queues/slirp' into staging
| -rw-r--r-- | slirp/mbuf.h | 5 | ||||
| -rw-r--r-- | slirp/tcp_input.c | 22 |
2 files changed, 13 insertions, 14 deletions
diff --git a/slirp/mbuf.h b/slirp/mbuf.h index 55170e517b..0708840f04 100644 --- a/slirp/mbuf.h +++ b/slirp/mbuf.h @@ -82,12 +82,13 @@ struct m_hdr { struct mbuf { struct m_hdr m_hdr; Slirp *slirp; + bool arp_requested; + uint64_t expiration_date; + /* start of dynamic buffer area, must be last element */ union M_dat { char m_dat_[1]; /* ANSI don't like 0 sized arrays */ char *m_ext_; } M_dat; - bool arp_requested; - uint64_t expiration_date; }; #define m_next m_hdr.mh_next diff --git a/slirp/tcp_input.c b/slirp/tcp_input.c index 2f1a196b39..942aaf44f1 100644 --- a/slirp/tcp_input.c +++ b/slirp/tcp_input.c @@ -1157,6 +1157,16 @@ step6: dodata: /* + * If this is a small packet, then ACK now - with Nagel + * congestion avoidance sender won't send more until + * he gets an ACK. + */ + if (ti->ti_len && (unsigned)ti->ti_len <= 5 && + ((struct tcpiphdr_2 *)ti)->first_char == (char)27) { + tp->t_flags |= TF_ACKNOW; + } + + /* * Process the segment text, merging it into the TCP sequencing queue, * and arranging for acknowledgment of receipt if necessary. * This process logically involves adjusting tp->rcv_wnd as data @@ -1235,18 +1245,6 @@ dodata: } /* - * If this is a small packet, then ACK now - with Nagel - * congestion avoidance sender won't send more until - * he gets an ACK. - * - * See above. - */ - if (ti->ti_len && (unsigned)ti->ti_len <= 5 && - ((struct tcpiphdr_2 *)ti)->first_char == (char)27) { - tp->t_flags |= TF_ACKNOW; - } - - /* * Return any desired output. */ if (needoutput || (tp->t_flags & TF_ACKNOW)) { |