Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/netbsd-2-0]: src/sys/netinet Pull up revision 1.9 (requested by christos...



details:   https://anonhg.NetBSD.org/src/rev/7a522fb80c11
branches:  netbsd-2-0
changeset: 561211:7a522fb80c11
user:      tron <tron%NetBSD.org@localhost>
date:      Sun May 30 11:25:35 2004 +0000

description:
Pull up revision 1.9 (requested by christos in ticket #416):
- remove superfluous assignment
- rt_gateway is already a pointer to struct sockaddr; don't take its address
  when assigning it to struct sockaddr_in *

diffstat:

 sys/netinet/ip_fil_netbsd.c |  5 ++---
 1 files changed, 2 insertions(+), 3 deletions(-)

diffs (26 lines):

diff -r 97411384d50a -r 7a522fb80c11 sys/netinet/ip_fil_netbsd.c
--- a/sys/netinet/ip_fil_netbsd.c       Sun May 30 11:25:19 2004 +0000
+++ b/sys/netinet/ip_fil_netbsd.c       Sun May 30 11:25:35 2004 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ip_fil_netbsd.c,v 1.3.2.4 2004/05/30 11:23:02 tron Exp $       */
+/*     $NetBSD: ip_fil_netbsd.c,v 1.3.2.5 2004/05/30 11:25:35 tron Exp $       */
 
 /*
  * Copyright (C) 1993-2003 by Darren Reed.
@@ -1045,7 +1045,6 @@
        if ((fr != NULL) && (fin->fin_rev != 0)) {
                if ((ifp != NULL) && (fdp == &fr->fr_tif))
                        return -1;
-               dst->sin_addr = ip->ip_dst;
        } else if (fdp != NULL) {
                if (fdp->fd_ip.s_addr != 0)
                        dst->sin_addr = fdp->fd_ip;
@@ -1065,7 +1064,7 @@
                goto bad;
        }
        if (ro->ro_rt->rt_flags & RTF_GATEWAY)
-               dst = (struct sockaddr_in *)&ro->ro_rt->rt_gateway;
+               dst = (struct sockaddr_in *)ro->ro_rt->rt_gateway;
        if (ro->ro_rt)
                ro->ro_rt->rt_use++;
 



Home | Main Index | Thread Index | Old Index