diff options
| author | Joel Sherrill <joel.sherrill@oarcorp.com> | 2013-01-23 13:09:18 -0600 |
|---|---|---|
| committer | Joel Sherrill <joel.sherrill@oarcorp.com> | 2013-01-23 13:38:04 -0600 |
| commit | bb679b31119f59a0c27609f606967b4ba326dae4 (patch) | |
| tree | 0399d7023685910e5b697ea6aa7fc40fbcf957ec /cpukit/libnetworking/nfs | |
| parent | bsp/gen83xx: Disable caches in bsp_restart() (diff) | |
| download | rtems-bb679b31119f59a0c27609f606967b4ba326dae4.tar.bz2 | |
Move <memory.h> and <sys/uio.h> to non-networking directory
These two header files were installed from libnetworking even
when networking was disabled. This patch moves them to a
non-networking location and updates uio.h to match the FreeBSD 8.x
source being used for the USB stack and TCP/IP stack upgrade.
- cpukit/include/memory.h
Move from cpukit/libnetworking/memory.h. No changes
- cpukit/include/sys/uio.h
Move from cpukit/libnetworking/sys/uio.h. Replace with FreeBSD 8.x version.
- cpukit/include/sys/_iovec.h
New. FreeBSD 8.x file supporting <sys/uio.h>.
- cpukit/Makefile.am
Reflect movement of <memory.h> and <sys/uio.h>.
- cpukit/preinstall.am
Regenerate
- cpukit/libnetworking/nfs/bootp_subr.c
Eliminate use of uio_procp field no longer in FreeBSD structure. This
field was set and never read so eliminating the set has no impact.
Diffstat (limited to 'cpukit/libnetworking/nfs')
| -rw-r--r-- | cpukit/libnetworking/nfs/bootp_subr.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/cpukit/libnetworking/nfs/bootp_subr.c b/cpukit/libnetworking/nfs/bootp_subr.c index 0645b89431..911e322879 100644 --- a/cpukit/libnetworking/nfs/bootp_subr.c +++ b/cpukit/libnetworking/nfs/bootp_subr.c @@ -380,7 +380,9 @@ bootpc_call( auio.uio_rw = UIO_WRITE; auio.uio_offset = 0; auio.uio_resid = sizeof(*call); +#ifndef __rtems__ auio.uio_procp = procp; +#endif error = sosend(so, nam, &auio, NULL, NULL, 0); if (error) { printf("bootpc_call: sosend: %d\n", error); @@ -414,7 +416,9 @@ bootpc_call( auio.uio_rw = UIO_READ; auio.uio_offset = 0; auio.uio_resid = sizeof(*reply); +#ifndef __rtems__ auio.uio_procp = procp; +#endif rcvflg = 0; error = soreceive(so, NULL, &auio, NULL, NULL, &rcvflg); |