diff options
| author | Greg Menke <gregory.menke@gsfc.nasa.gov> | 2004-12-06 20:29:51 +0000 |
|---|---|---|
| committer | Greg Menke <gregory.menke@gsfc.nasa.gov> | 2004-12-06 20:29:51 +0000 |
| commit | 5194a28430a6f69264c10b3dcc91e53f7d54f919 (patch) | |
| tree | 4850b03ecd680755d71020361eb744aecbaa2378 /cpukit/libnetworking/netinet | |
| parent | Changelog, PR728 & PR729 (diff) | |
| download | rtems-5194a28430a6f69264c10b3dcc91e53f7d54f919.tar.bz2 | |
PR 730
* cpu_asm.S: Collected PR 601 changes for commit to cvshead
for rtems-4.7
Diffstat (limited to 'cpukit/libnetworking/netinet')
| -rw-r--r-- | cpukit/libnetworking/netinet/tcp_input.c | 8 | ||||
| -rw-r--r-- | cpukit/libnetworking/netinet/tcp_subr.c | 2 | ||||
| -rw-r--r-- | cpukit/libnetworking/netinet/tcp_var.h | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/cpukit/libnetworking/netinet/tcp_input.c b/cpukit/libnetworking/netinet/tcp_input.c index a33f9593c4..5c83e5b091 100644 --- a/cpukit/libnetworking/netinet/tcp_input.c +++ b/cpukit/libnetworking/netinet/tcp_input.c @@ -201,7 +201,7 @@ tcp_reass(tp, ti, m) } tcpstat.tcps_rcvoopack++; tcpstat.tcps_rcvoobyte += ti->ti_len; -#if (defined(__GNUC__) && defined(__arm__)) +#if (defined(__GNUC__) && (defined(__arm__) || defined(__mips__))) STR32_UNALGN(ti,m); #else REASS_MBUF(ti) = m; /* XXX */ @@ -217,7 +217,7 @@ tcp_reass(tp, ti, m) if (i < q->ti_len) { q->ti_seq += i; q->ti_len -= i; -#if (defined(__GNUC__) && defined(__arm__)) +#if (defined(__GNUC__) && (defined(__arm__) || defined(__mips__))) LD32_UNALGN(q,m); m_adj(m, i); #else @@ -226,7 +226,7 @@ tcp_reass(tp, ti, m) break; } q = (struct tcpiphdr *)q->ti_next; -#if (defined(__GNUC__) && defined(__arm__)) +#if (defined(__GNUC__) && (defined(__arm__) || defined(__mips__))) LD32_UNALGN((struct tcpiphdr *)q->ti_prev,m); #else m = REASS_MBUF((struct tcpiphdr *)q->ti_prev); @@ -254,7 +254,7 @@ present: tp->rcv_nxt += ti->ti_len; flags = ti->ti_flags & TH_FIN; remque(ti); -#if (defined(__GNUC__) && defined(__arm__)) +#if (defined(__GNUC__) && (defined(__arm__) || defined(__mips__))) LD32_UNALGN(ti,m); #else m = REASS_MBUF(ti); diff --git a/cpukit/libnetworking/netinet/tcp_subr.c b/cpukit/libnetworking/netinet/tcp_subr.c index 5802ccc465..e879d855be 100644 --- a/cpukit/libnetworking/netinet/tcp_subr.c +++ b/cpukit/libnetworking/netinet/tcp_subr.c @@ -399,7 +399,7 @@ tcp_close(tp) t = tp->seg_next; while (t != (struct tcpiphdr *)tp) { t = (struct tcpiphdr *)t->ti_next; -#if (defined(__GNUC__) && defined(__arm__)) +#if (defined(__GNUC__) && (defined(__arm__) || defined(__mips__))) LD32_UNALGN((struct tcpiphdr *)t->ti_prev,m); #else m = REASS_MBUF((struct tcpiphdr *)t->ti_prev); diff --git a/cpukit/libnetworking/netinet/tcp_var.h b/cpukit/libnetworking/netinet/tcp_var.h index 6c772b5053..0c05b03c56 100644 --- a/cpukit/libnetworking/netinet/tcp_var.h +++ b/cpukit/libnetworking/netinet/tcp_var.h @@ -225,7 +225,7 @@ struct rmxp_tao { * port numbers (which are no longer needed once we've located the * tcpcb) are overlayed with an mbuf pointer. */ -#if (defined(__GNUC__) && defined(__arm__)) +#if (defined(__GNUC__) && (defined(__arm__) || defined(__mips__))) #define STR32_UNALGN(ti,m) \ (ti)->ti_sport = (unsigned short)(((unsigned int) m & 0xffff0000) >> 16); \ (ti)->ti_dport = (unsigned short) ((unsigned int) m & 0x0000ffff); |