diff options
| author |   mpi <mpi@openbsd.org> | 2014-04-11 08:44:37 +0000 |
|---|---|---|
| committer | mpi <mpi@openbsd.org> | 2014-04-11 08:44:37 +0000 |
| commit | 080a56afdfc5982f832533561f23a7e543cccda9 (patch) | |
| tree | f27c710abd9f2b54385fe26194eb3be3618a52cb | |
| parent | sync with libdrm 2.4.53 (diff) | |
| download | wireguard-openbsd-080a56afdfc5982f832533561f23a7e543cccda9.tar.xz wireguard-openbsd-080a56afdfc5982f832533561f23a7e543cccda9.zip | |
Interfaces are associated to rdomains, make it clear by renaming
`sc_rtableid' into `sc_rdomain'. No functional change.
ok reyk@
| -rw-r--r-- | sys/net/if_vxlan.c | 14 | ||||
| -rw-r--r-- | sys/net/if_vxlan.h | 4 |
2 files changed, 9 insertions, 9 deletions
diff --git a/sys/net/if_vxlan.c b/sys/net/if_vxlan.c index 6364877dfe0..262baa88e7f 100644 --- a/sys/net/if_vxlan.c +++ b/sys/net/if_vxlan.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_vxlan.c,v 1.10 2013/10/22 08:34:04 reyk Exp $ */ +/* $OpenBSD: if_vxlan.c,v 1.11 2014/04/11 08:44:37 mpi Exp $ */ /* * Copyright (c) 2013 Reyk Floeter <reyk@openbsd.org> @@ -219,8 +219,8 @@ vxlan_multicast_join(struct ifnet *ifp, struct sockaddr_in *src, if (src->sin_addr.s_addr == INADDR_ANY || IN_MULTICAST(src->sin_addr.s_addr)) return (EINVAL); - if ((ifa = ifa_ifwithaddr(sintosa(src), - sc->sc_rtableid)) == NULL || (mifp = ifa->ifa_ifp) == NULL || + if ((ifa = ifa_ifwithaddr(sintosa(src), sc->sc_rdomain)) == NULL || + (mifp = ifa->ifa_ifp) == NULL || (mifp->if_flags & IFF_MULTICAST) == 0) return (EADDRNOTAVAIL); @@ -410,13 +410,13 @@ vxlanioctl(struct ifnet *ifp, u_long cmd, caddr_t data) break; } s = splnet(); - sc->sc_rtableid = ifr->ifr_rdomainid; + sc->sc_rdomain = ifr->ifr_rdomainid; (void)vxlan_config(ifp, NULL, NULL); splx(s); break; case SIOCGLIFPHYRTABLE: - ifr->ifr_rdomainid = sc->sc_rtableid; + ifr->ifr_rdomainid = sc->sc_rdomain; break; case SIOCSLIFPHYTTL: @@ -508,7 +508,7 @@ vxlan_lookup(struct mbuf *m, struct udphdr *uh, int iphlen, LIST_FOREACH(sc, &vxlan_tagh[VXLAN_TAGHASH(vni)], sc_entry) { if ((uh->uh_dport == sc->sc_dstport) && vni == sc->sc_vnetid && - sc->sc_rtableid == rtable_l2(m->m_pkthdr.rdomain)) + sc->sc_rdomain == rtable_l2(m->m_pkthdr.rdomain)) goto found; } @@ -628,7 +628,7 @@ vxlan_output(struct ifnet *ifp, struct mbuf *m) ifp->if_opackets++; ifp->if_obytes += m->m_pkthdr.len; - m->m_pkthdr.rdomain = sc->sc_rtableid; + m->m_pkthdr.rdomain = sc->sc_rdomain; #if NPF > 0 pf_pkt_addr_changed(m); diff --git a/sys/net/if_vxlan.h b/sys/net/if_vxlan.h index af5a8dacb31..a704816d5ed 100644 --- a/sys/net/if_vxlan.h +++ b/sys/net/if_vxlan.h @@ -1,4 +1,4 @@ -/* $OpenBSD: if_vxlan.h,v 1.4 2013/10/19 18:22:37 reyk Exp $ */ +/* $OpenBSD: if_vxlan.h,v 1.5 2014/04/11 08:44:37 mpi Exp $ */ /* * Copyright (c) 2013 Reyk Floeter <reyk@openbsd.org> @@ -54,7 +54,7 @@ struct vxlan_softc { struct sockaddr_storage sc_src; struct sockaddr_storage sc_dst; in_port_t sc_dstport; - u_int sc_rtableid; + u_int sc_rdomain; u_int32_t sc_vnetid; u_int8_t sc_ttl; |