d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Deal with ARCNET L2 multicast mapping for IPv6 the same way as in IPv4:

Browse Source 
handle it in arc_output() instead of nd6_storelladdr().
* Remove IFT_ARCNET check from arpresolve() since arc_output() does not
  use arpresolve() to handle broadcast/multicast. This check was there
  since r84931. It looks like it was not used since r89099 (initial
  import of Arcnet support where multicast is handled separately).
* Remove IFT_IEEE1394 case from nd6_storelladdr() since firewire_output()
  calles nd6_storelladdr() for unicast addresses only.
* Remove IFT_ARCNET case from nd6_storelladdr() since arc_output() now
  handles multicast by itself.

As a result, we have the following pattern: all non-ethernet-style
media have their own multicast map handling inside their appropriate
routines. On the other hand, arpresolve() (and nd6_storelladdr()) which
meant to be 'generic' ones de-facto handles ethernet-only multicast maps.

MFC after:	3 weeks
This commit is contained in:
Alexander V. Chernikov 2015-01-09 12:56:51 +00:00
parent 40c1416a62
commit d63e657c04
3 changed files with 5 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
sys/net/if_arcsubr.c
View File

@ -167,6 +167,9 @@ arc_output(struct ifnet *ifp, struct mbuf *m, const struct sockaddr *dst,
#endif #endif
#ifdef INET6 #ifdef INET6
case AF_INET6: case AF_INET6:
if ((m->m_flags & M_MCAST) != NULL)
adst = arcbroadcastaddr; /* ARCnet broadcast address */
else
error = nd6_storelladdr(ifp, m, dst, (u_char *)&adst, NULL); error = nd6_storelladdr(ifp, m, dst, (u_char *)&adst, NULL);
if (error) if (error)
return (error); return (error);

2
sys/netinet/if_ether.c
View File

@ -317,7 +317,7 @@ arpresolve(struct ifnet *ifp, int is_gw, struct mbuf *m,
ifp->if_broadcastaddr, ifp->if_addrlen); ifp->if_broadcastaddr, ifp->if_addrlen);
return (0); return (0);
} }
if (m->m_flags & M_MCAST && ifp->if_type != IFT_ARCNET) { if (m->m_flags & M_MCAST) {
/* multicast */ /* multicast */
ETHER_MAP_IP_MULTICAST(&SIN(dst)->sin_addr, desten); ETHER_MAP_IP_MULTICAST(&SIN(dst)->sin_addr, desten);
return (0); return (0);

13
sys/netinet6/nd6.c
View File

@ -2213,8 +2213,6 @@ nd6_storelladdr(struct ifnet *ifp, struct mbuf *m,
*pflags = 0; *pflags = 0;
IF_AFDATA_UNLOCK_ASSERT(ifp); IF_AFDATA_UNLOCK_ASSERT(ifp);
if (m != NULL && m->m_flags & M_MCAST) { if (m != NULL && m->m_flags & M_MCAST) {
int i;
switch (ifp->if_type) { switch (ifp->if_type) {
case IFT_ETHER: case IFT_ETHER:
case IFT_FDDI: case IFT_FDDI:
@ -2229,17 +2227,6 @@ nd6_storelladdr(struct ifnet *ifp, struct mbuf *m,
ETHER_MAP_IPV6_MULTICAST(&SIN6(dst)->sin6_addr, ETHER_MAP_IPV6_MULTICAST(&SIN6(dst)->sin6_addr,
desten); desten);
return (0); return (0);
case IFT_IEEE1394:
/*
* netbsd can use if_broadcastaddr, but we don't do so
* to reduce # of ifdef.
*/
for (i = 0; i < ifp->if_addrlen; i++)
desten[i] = ~0;
return (0);
case IFT_ARCNET:
*desten = 0;
return (0);
default: default:
m_freem(m); m_freem(m);
return (EAFNOSUPPORT); return (EAFNOSUPPORT);