diff options
| author | Martin Pieuchot <mpi@cvs.openbsd.org> | 2014-04-11 08:44:38 +0000 |
|---|---|---|
| committer | Martin Pieuchot <mpi@cvs.openbsd.org> | 2014-04-11 08:44:38 +0000 |
| commit | a1f19185ab0c787a8fde6be25b5f85c60f30815a (patch) | |
| tree | 1452e72bd4bc07b150bc94b6d4b19b8b04d62e46 /sys/net/if_vxlan.c | |
| parent | c7ba62d23fd4fdfedd9bad3b84d344e4434457ce (diff) | |
Interfaces are associated to rdomains, make it clear by renaming
`sc_rtableid' into `sc_rdomain'. No functional change.
ok reyk@
Diffstat (limited to 'sys/net/if_vxlan.c')
| -rw-r--r-- | sys/net/if_vxlan.c | 14 |
1 files changed, 7 insertions, 7 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); |