ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'kiszka/queues/slirp' into staging

This commit is contained in:
Anthony Liguori 2011-09-29 13:33:47 -05:00
parent 62ec6073cd 2b44043265
commit 8f440cda08
2 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
slirp/mbuf.h
View File

@ -82,12 +82,13 @@ struct m_hdr {
struct mbuf { struct mbuf {
struct m_hdr m_hdr; struct m_hdr m_hdr;
Slirp *slirp; Slirp *slirp;
bool arp_requested;
uint64_t expiration_date;
/* start of dynamic buffer area, must be last element */
union M_dat { union M_dat {
char m_dat_[1]; /* ANSI don't like 0 sized arrays */ char m_dat_[1]; /* ANSI don't like 0 sized arrays */
char *m_ext_; char *m_ext_;
} M_dat; } M_dat;
bool arp_requested;
uint64_t expiration_date;
}; };
#define m_next m_hdr.mh_next #define m_next m_hdr.mh_next

22
slirp/tcp_input.c
View File

@ -1156,6 +1156,16 @@ step6:
tp->rcv_up = tp->rcv_nxt; tp->rcv_up = tp->rcv_nxt;
dodata: 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, * Process the segment text, merging it into the TCP sequencing queue,
* and arranging for acknowledgment of receipt if necessary. * and arranging for acknowledgment of receipt if necessary.
@ -1234,18 +1244,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. * Return any desired output.
*/ */