Date: Sat, 2 May 2015 20:31:28 +0000 (UTC) From: Gleb Smirnoff <glebius@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r282354 - in head: sys/netinet6 usr.sbin/rtsold Message-ID: <201505022031.t42KVSRv079600@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: glebius Date: Sat May 2 20:31:27 2015 New Revision: 282354 URL: https://svnweb.freebsd.org/changeset/base/282354 Log: Remove #ifdef IFT_FOO. Submitted by: Guy Yur <guyyur gmail.com> Modified: head/sys/netinet6/in6.c head/sys/netinet6/in6_ifattach.c head/sys/netinet6/nd6.c head/sys/netinet6/nd6_nbr.c head/usr.sbin/rtsold/if.c Modified: head/sys/netinet6/in6.c ============================================================================== --- head/sys/netinet6/in6.c Sat May 2 20:27:37 2015 (r282353) +++ head/sys/netinet6/in6.c Sat May 2 20:31:27 2015 (r282354) @@ -1997,18 +1997,9 @@ in6_if2idlen(struct ifnet *ifp) { switch (ifp->if_type) { case IFT_ETHER: /* RFC2464 */ -#ifdef IFT_PROPVIRTUAL case IFT_PROPVIRTUAL: /* XXX: no RFC. treat it as ether */ -#endif -#ifdef IFT_L2VLAN case IFT_L2VLAN: /* ditto */ -#endif -#ifdef IFT_IEEE80211 case IFT_IEEE80211: /* ditto */ -#endif -#ifdef IFT_MIP - case IFT_MIP: /* ditto */ -#endif case IFT_INFINIBAND: return (64); case IFT_FDDI: /* RFC2467 */ Modified: head/sys/netinet6/in6_ifattach.c ============================================================================== --- head/sys/netinet6/in6_ifattach.c Sat May 2 20:27:37 2015 (r282353) +++ head/sys/netinet6/in6_ifattach.c Sat May 2 20:31:27 2015 (r282354) @@ -274,9 +274,7 @@ found: case IFT_ISO88025: case IFT_ATM: case IFT_IEEE1394: -#ifdef IFT_IEEE80211 case IFT_IEEE80211: -#endif /* IEEE802/EUI64 cases - what others? */ /* IEEE1394 uses 16byte length address starting with EUI64 */ if (addrlen > 8) @@ -338,9 +336,7 @@ found: break; case IFT_GIF: -#ifdef IFT_STF case IFT_STF: -#endif /* * RFC2893 says: "SHOULD use IPv4 address as ifid source". * however, IPv4 address is not very suitable as unique Modified: head/sys/netinet6/nd6.c ============================================================================== --- head/sys/netinet6/nd6.c Sat May 2 20:27:37 2015 (r282353) +++ head/sys/netinet6/nd6.c Sat May 2 20:31:27 2015 (r282354) @@ -2145,12 +2145,8 @@ nd6_need_cache(struct ifnet *ifp) case IFT_ETHER: case IFT_FDDI: case IFT_IEEE1394: -#ifdef IFT_L2VLAN case IFT_L2VLAN: -#endif -#ifdef IFT_IEEE80211 case IFT_IEEE80211: -#endif case IFT_INFINIBAND: case IFT_BRIDGE: case IFT_PROPVIRTUAL: @@ -2235,12 +2231,8 @@ nd6_storelladdr(struct ifnet *ifp, struc switch (ifp->if_type) { case IFT_ETHER: case IFT_FDDI: -#ifdef IFT_L2VLAN case IFT_L2VLAN: -#endif -#ifdef IFT_IEEE80211 case IFT_IEEE80211: -#endif case IFT_BRIDGE: case IFT_ISO88025: ETHER_MAP_IPV6_MULTICAST(&SIN6(dst)->sin6_addr, Modified: head/sys/netinet6/nd6_nbr.c ============================================================================== --- head/sys/netinet6/nd6_nbr.c Sat May 2 20:27:37 2015 (r282353) +++ head/sys/netinet6/nd6_nbr.c Sat May 2 20:31:27 2015 (r282354) @@ -1149,12 +1149,8 @@ nd6_ifptomac(struct ifnet *ifp) case IFT_ETHER: case IFT_FDDI: case IFT_IEEE1394: -#ifdef IFT_L2VLAN case IFT_L2VLAN: -#endif -#ifdef IFT_IEEE80211 case IFT_IEEE80211: -#endif case IFT_INFINIBAND: case IFT_BRIDGE: case IFT_ISO88025: @@ -1549,9 +1545,7 @@ nd6_dad_duplicated(struct ifaddr *ifa, s case IFT_FDDI: case IFT_ATM: case IFT_IEEE1394: -#ifdef IFT_IEEE80211 case IFT_IEEE80211: -#endif case IFT_INFINIBAND: in6 = ia->ia_addr.sin6_addr; if (in6_get_hw_ifid(ifp, &in6) == 0 && Modified: head/usr.sbin/rtsold/if.c ============================================================================== --- head/usr.sbin/rtsold/if.c Sat May 2 20:27:37 2015 (r282353) +++ head/usr.sbin/rtsold/if.c Sat May 2 20:31:27 2015 (r282354) @@ -247,9 +247,7 @@ lladdropt_length(struct sockaddr_dl *sdl { switch (sdl->sdl_type) { case IFT_ETHER: -#ifdef IFT_IEEE80211 case IFT_IEEE80211: -#endif return (ROUNDUP8(ETHER_ADDR_LEN + 2)); default: return (0); @@ -265,9 +263,7 @@ lladdropt_fill(struct sockaddr_dl *sdl, switch (sdl->sdl_type) { case IFT_ETHER: -#ifdef IFT_IEEE80211 case IFT_IEEE80211: -#endif ndopt->nd_opt_len = (ROUNDUP8(ETHER_ADDR_LEN + 2)) >> 3; addr = (char *)(ndopt + 1); memcpy(addr, LLADDR(sdl), ETHER_ADDR_LEN);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201505022031.t42KVSRv079600>