netbroadcast should always be all-ones

SCCS-vsn: sys/netinet/in.c 7.7

diff --git a/usr/src/sys/netinet/in.c b/usr/src/sys/netinet/in.c
index b3a99bc..43363f5 100644 (file)
--- a/usr/src/sys/netinet/in.c
+++ b/usr/src/sys/netinet/in.c
@@ -9,7 +9,7 @@
  * software without specific prior written permission. This software
  * is provided ``as is'' without express or implied warranty.
  *
  * software without specific prior written permission. This software
  * is provided ``as is'' without express or implied warranty.
  *

- *     @(#)in.c        7.6 (Berkeley) %G%
+ *     @(#)in.c        7.7 (Berkeley) %G%

  */
 
 #include "param.h"
  */
 
 #include "param.h"


@@ -204,7 +204,6 @@ in_control(so, cmd, data, ifp)
 {
        register struct ifreq *ifr = (struct ifreq *)data;
        register struct in_ifaddr *ia = 0;
 {
        register struct ifreq *ifr = (struct ifreq *)data;
        register struct in_ifaddr *ia = 0;

-       u_long tmp;

        struct ifaddr *ifa;
        struct mbuf *m;
        int error;
        struct ifaddr *ifa;
        struct mbuf *m;
        int error;


@@ -312,12 +311,6 @@ in_control(so, cmd, data, ifp)
                if ((ifp->if_flags & IFF_BROADCAST) == 0)
                        return (EINVAL);
                ia->ia_broadaddr = ifr->ifr_broadaddr;
                if ((ifp->if_flags & IFF_BROADCAST) == 0)
                        return (EINVAL);
                ia->ia_broadaddr = ifr->ifr_broadaddr;

-               tmp = ntohl(satosin(&ia->ia_broadaddr)->sin_addr.s_addr);
-               if ((tmp &~ ia->ia_subnetmask) == ~ia->ia_subnetmask)
-                       tmp |= ~ia->ia_netmask;
-               else if ((tmp &~ ia->ia_subnetmask) == 0)
-                       tmp &= ia->ia_netmask;
-               ia->ia_netbroadcast.s_addr = htonl(tmp);

                break;
 
        case SIOCSIFADDR:
                break;
 
        case SIOCSIFADDR: