Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use satocsdl() instead of SDL().

This commit is contained in:
dyoung 2007-08-07 04:41:15 +00:00
parent 846a5ed688
commit 9ca94f6e09
1 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
sys/net/if_strip.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: if_strip.c,v 1.77 2007/07/19 20:48:52 dyoung Exp $ */
/* $NetBSD: if_strip.c,v 1.78 2007/08/07 04:41:15 dyoung Exp $ */
/* from: NetBSD: if_sl.c,v 1.38 1996/02/13 22:00:23 christos Exp $ */
/*
@ -87,7 +87,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: if_strip.c,v 1.77 2007/07/19 20:48:52 dyoung Exp $");
__KERNEL_RCSID(0, "$NetBSD: if_strip.c,v 1.78 2007/08/07 04:41:15 dyoung Exp $");
#include "opt_inet.h"
#include "bpfilter.h"
@ -756,8 +756,6 @@ stripoutput(struct ifnet *ifp, struct mbuf *m, const struct sockaddr *dst,
return (EHOSTUNREACH);
}
#define SDL(__a) ((const struct sockaddr_dl *)(__a))
#ifdef DEBUG
if (rt) {
printf("stripout, rt: dst af%d gw af%d",
@ -775,19 +773,19 @@ stripoutput(struct ifnet *ifp, struct mbuf *m, const struct sockaddr *dst,
/* assume rt is never NULL */
if (rt == NULL || rt->rt_gateway->sa_family != AF_LINK
|| SDL(rt->rt_gateway)->sdl_alen != ifp->if_addrlen) {
|| satocsdl(rt->rt_gateway)->sdl_alen != ifp->if_addrlen) {
DPRINTF(("strip: could not arp starmode addr %x\n",
satocsin(dst)->sin_addr.s_addr));
m_freem(m);
return (EHOSTUNREACH);
}
/*bcopy(LLADDR(SDL(rt->rt_gateway)), dldst, ifp->if_addrlen);*/
dldst = CLLADDR(SDL(rt->rt_gateway));
/*bcopy(LLADDR(satocsdl(rt->rt_gateway)), dldst, ifp->if_addrlen);*/
dldst = CLLADDR(satocsdl(rt->rt_gateway));
break;
case AF_LINK:
/*bcopy(LLADDR(SDL(rt->rt_gateway)), dldst, ifp->if_addrlen);*/
dldst = CLLADDR(SDL(dst));
/*bcopy(LLADDR(satocsdl(rt->rt_gateway)), dldst, ifp->if_addrlen);*/
dldst = CLLADDR(satocsdl(dst));
break;
default: