diff options
| author | John Hay <jhay@FreeBSD.org> | 1997-06-26 19:36:03 +0000 |
|---|---|---|
| committer | John Hay <jhay@FreeBSD.org> | 1997-06-26 19:36:03 +0000 |
| commit | 8f65b5944d81ac1f4afe80ffec39905544b4a951 (patch) | |
| tree | 225872a0218a8ae5f6b0dba670c972bd0307b504 /sys/netipx/ipx_ip.c | |
| parent | ee97e537f7e707277180963a0b963f94b0b70c91 (diff) | |
| download | src-8f65b5944d81ac1f4afe80ffec39905544b4a951.tar.gz src-8f65b5944d81ac1f4afe80ffec39905544b4a951.zip | |
Removed the #ifdef IPXERRORMSGS'ed code. Fix a lot of style errors that I
introduced with the previous commit.
Style fixes Submitted by: Bruce Evans <bde@FreeBSD.ORG>
Notes
Notes:
svn path=/head/; revision=26965
Diffstat (limited to 'sys/netipx/ipx_ip.c')
| -rw-r--r-- | sys/netipx/ipx_ip.c | 17 |
1 files changed, 5 insertions, 12 deletions
diff --git a/sys/netipx/ipx_ip.c b/sys/netipx/ipx_ip.c index 34a41b3f379c..d023a02db513 100644 --- a/sys/netipx/ipx_ip.c +++ b/sys/netipx/ipx_ip.c @@ -33,7 +33,7 @@ * * @(#)ipx_ip.c * - * $Id: ipx_ip.c,v 1.14 1997/05/01 06:21:28 jhay Exp $ + * $Id: ipx_ip.c,v 1.15 1997/05/10 09:58:52 jhay Exp $ */ /* @@ -42,15 +42,11 @@ #ifdef IPXIP #include <sys/param.h> -#include <sys/queue.h> #include <sys/systm.h> #include <sys/malloc.h> #include <sys/mbuf.h> -#include <sys/proc.h> #include <sys/protosw.h> #include <sys/socket.h> -#include <sys/socketvar.h> -#include <sys/errno.h> #include <sys/sockio.h> #include <net/if.h> @@ -63,8 +59,6 @@ #include <netinet/ip.h> #include <netinet/ip_var.h> -#include <machine/mtpr.h> - #include <netipx/ipx.h> #include <netipx/ipx_if.h> #include <netipx/ipx_ip.h> @@ -384,12 +378,11 @@ ipxip_route(so, m, p) ifr_ipxip.ifr_dstaddr = *(struct sockaddr *)ipx_dst; ipx_control(so, (int)SIOCSIFDSTADDR, (caddr_t)&ifr_ipxip, (struct ifnet *)ifn, p); - /* use any our address */ -#if XXX_Hmmmm - if (ia != NULL) - satoipx_addr(ifr_ipxip.ifr_addr).x_host = + + /* use any of our addresses */ + satoipx_addr(ifr_ipxip.ifr_addr).x_host = ipx_ifaddr->ia_addr.sipx_addr.x_host; -#endif + return (ipx_control(so, (int)SIOCSIFADDR, (caddr_t)&ifr_ipxip, (struct ifnet *)ifn, p)); } |