PERFORCE change 153272 for review
Sam Leffler
sam at FreeBSD.org
Thu Nov 20 12:00:35 PST 2008
http://perforce.freebsd.org/chv.cgi?CH=153272
Change 153272 by sam at sam_ebb on 2008/11/20 19:59:53
kill dead token ring code
Approved by: qingli
Affected files ...
.. //depot/projects/arp-v2/src/sys/netinet/if_ether.c#13 edit
Differences ...
==== //depot/projects/arp-v2/src/sys/netinet/if_ether.c#13 (text+ko) ====
@@ -607,41 +607,6 @@
(void)memcpy(&la->ll_addr, ar_sha(ah), ifp->if_addrlen);
la->la_flags |= LLE_VALID;
- /*
- * If we receive an arp from a token-ring station over
- * a token-ring nic then try to save the source
- * routing info.
- */
- if (ifp->if_type == IFT_ISO88025) {
- struct iso88025_header *th = NULL;
- struct iso88025_sockaddr_dl_data *trld;
-
- th = (struct iso88025_header *)m->m_pkthdr.header;
- trld = SDL_ISO88025(sdl);
- rif_len = TR_RCF_RIFLEN(th->rcf);
- if ((th->iso88025_shost[0] & TR_RII) &&
- (rif_len > 2)) {
- trld->trld_rcf = th->rcf;
- trld->trld_rcf ^= htons(TR_RCF_DIR);
- memcpy(trld->trld_route, th->rd, rif_len - 2);
- trld->trld_rcf &= ~htons(TR_RCF_BCST_MASK);
- /*
- * Set up source routing information for
- * reply packet (XXX)
- */
- m->m_data -= rif_len;
- m->m_len += rif_len;
- m->m_pkthdr.len += rif_len;
- } else {
- th->iso88025_shost[0] &= ~TR_RII;
- trld->trld_rcf = 0;
- }
- m->m_data -= 8;
- m->m_len += 8;
- m->m_pkthdr.len += 8;
- th->rcf = trld->trld_rcf;
- }
-
if (!(la->la_flags & LLE_STATIC)) {
la->la_expire = time_uptime + arpt_keep;
callout_reset(&la->la_timer, hz * V_arpt_keep,
More information about the p4-projects
mailing list