Remove #ifdef IFT_FOO.
Submitted by: Guy Yur <guyyur gmail.com>
This commit is contained in:
parent
89c241d1a6
commit
0fa5aacd8b
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=282354
@ -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 */
|
||||
|
@ -274,9 +274,7 @@ in6_get_hw_ifid(struct ifnet *ifp, struct in6_addr *in6)
|
||||
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 @@ in6_get_hw_ifid(struct ifnet *ifp, struct in6_addr *in6)
|
||||
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
|
||||
|
@ -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, struct mbuf *m,
|
||||
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,
|
||||
|
@ -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, struct dadq *dp)
|
||||
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 &&
|
||||
|
@ -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, struct nd_opt_hdr *ndopt)
|
||||
|
||||
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);
|
||||
|
Loading…
Reference in New Issue
Block a user