diff options
| author | Ralf Corsepius <ralf.corsepius@rtems.org> | 2004-04-30 12:44:07 +0000 |
|---|---|---|
| committer | Ralf Corsepius <ralf.corsepius@rtems.org> | 2004-04-30 12:44:07 +0000 |
| commit | 50c0d1ff00f5f653e40de3c0beb3f9c95d2cbfa3 (patch) | |
| tree | 63af3c1f7bdeea6baa5db55217c8dea285e37317 /cpukit | |
| parent | 2004-04-29 Ralf Corsepius <ralf_corsepius@rtems.org> (diff) | |
| download | rtems-50c0d1ff00f5f653e40de3c0beb3f9c95d2cbfa3.tar.bz2 | |
2004-04-30 Ralf Corsepius <ralf_corsepius@rtems.org>
* libnetworking/netinet/in.c: Partial update from FreeBSD.
Diffstat (limited to 'cpukit')
| -rw-r--r-- | cpukit/ChangeLog | 4 | ||||
| -rw-r--r-- | cpukit/libnetworking/netinet/in.c | 11 |
2 files changed, 7 insertions, 8 deletions
diff --git a/cpukit/ChangeLog b/cpukit/ChangeLog index bc5b4c5e2c..f680e5a80b 100644 --- a/cpukit/ChangeLog +++ b/cpukit/ChangeLog @@ -1,3 +1,7 @@ +2004-04-30 Ralf Corsepius <ralf_corsepius@rtems.org> + + * libnetworking/netinet/in.c: Partial update from FreeBSD. + 2004-04-26 Ralf Corsepius <ralf_corsepius@rtems.org> * libnetworking/kern/kern_sysctl.c: Partial updates from FreeBSD. diff --git a/cpukit/libnetworking/netinet/in.c b/cpukit/libnetworking/netinet/in.c index 701406f207..3b246fd210 100644 --- a/cpukit/libnetworking/netinet/in.c +++ b/cpukit/libnetworking/netinet/in.c @@ -10,10 +10,6 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. * 4. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. @@ -31,7 +27,7 @@ * SUCH DAMAGE. * * @(#)in.c 8.4 (Berkeley) 1/9/95 - * $Id$ + * $FreeBSD: src/sys/netinet/in.c,v 1.75 2004/04/07 20:46:13 imp Exp $ */ #include <sys/param.h> @@ -161,7 +157,6 @@ in_control(so, cmd, data, ifp) struct in_aliasreq *ifra = (struct in_aliasreq *)data; struct sockaddr_in oldaddr; int error, hostIsNew, maskIsNew, s; - u_long i; struct multi_kludge *mk; /* @@ -322,8 +317,8 @@ in_control(so, cmd, data, ifp) (struct sockaddr_in *) &ifr->ifr_addr, 1)); case SIOCSIFNETMASK: - i = ifra->ifra_addr.sin_addr.s_addr; - ia->ia_subnetmask = ntohl(ia->ia_sockmask.sin_addr.s_addr = i); + ia->ia_sockmask.sin_addr = ifra->ifra_addr.sin_addr; + ia->ia_subnetmask = ntohl(ia->ia_sockmask.sin_addr.s_addr); break; case SIOCAIFADDR: |