diff options
| author |   mpi <mpi@openbsd.org> | 2013-11-21 09:08:38 +0000 |
|---|---|---|
| committer | mpi <mpi@openbsd.org> | 2013-11-21 09:08:38 +0000 |
| commit | ba5065a96e0540bb1173e71a1b724b4a0c35b33f (patch) | |
| tree | 8acdcb46d00fa37f508ea1613b44f7188e888fe7 | |
| parent | correctly set verify flag on the listener (diff) | |
| download | wireguard-openbsd-ba5065a96e0540bb1173e71a1b724b4a0c35b33f.tar.xz wireguard-openbsd-ba5065a96e0540bb1173e71a1b724b4a0c35b33f.zip | |
Replace the last usage of IA_SIN() and kill this macro.
ok henning@, sthen@, mikeb@, deraadt@
| -rw-r--r-- | sys/netinet/if_ether.c | 6 | ||||
| -rw-r--r-- | sys/netinet/in_var.h | 7 |
2 files changed, 4 insertions, 9 deletions
diff --git a/sys/netinet/if_ether.c b/sys/netinet/if_ether.c index dd3a641d76b..ecf3b89e1d6 100644 --- a/sys/netinet/if_ether.c +++ b/sys/netinet/if_ether.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_ether.c,v 1.111 2013/11/11 09:15:34 mpi Exp $ */ +/* $OpenBSD: if_ether.c,v 1.112 2013/11/21 09:08:38 mpi Exp $ */ /* $NetBSD: if_ether.c,v 1.31 1996/05/11 12:59:58 mycroft Exp $ */ /* @@ -868,8 +868,8 @@ arp_ifinit(struct arpcom *ac, struct ifaddr *ifa) /* Warn the user if another station has this IP address. */ arprequest(&ac->ac_if, - &(IA_SIN(ifa)->sin_addr.s_addr), - &(IA_SIN(ifa)->sin_addr.s_addr), + &satosin(ifa->ifa_addr)->sin_addr.s_addr, + &satosin(ifa->ifa_addr)->sin_addr.s_addr, ac->ac_enaddr); ifa->ifa_rtrequest = arp_rtrequest; ifa->ifa_flags |= RTF_CLONING; diff --git a/sys/netinet/in_var.h b/sys/netinet/in_var.h index 249966bb78a..b95801b1674 100644 --- a/sys/netinet/in_var.h +++ b/sys/netinet/in_var.h @@ -1,4 +1,4 @@ -/* $OpenBSD: in_var.h,v 1.26 2013/10/23 15:12:42 mpi Exp $ */ +/* $OpenBSD: in_var.h,v 1.27 2013/11/21 09:08:38 mpi Exp $ */ /* $NetBSD: in_var.h,v 1.16 1996/02/13 23:42:15 christos Exp $ */ /* @@ -73,11 +73,6 @@ struct in_aliasreq { #define ifra_broadaddr ifra_dstaddr struct sockaddr_in ifra_mask; }; -/* - * Given a pointer to an in_ifaddr (ifaddr), - * return a pointer to the addr as a sockaddr_in. - */ -#define IA_SIN(ia) (&(((struct in_ifaddr *)(ia))->ia_addr)) #ifdef _KERNEL |