svn commit: r312929 - in head: sys/net sys/netinet6 usr.sbin/rtsold

[Andriy Voskoboinyk]

Author: avos
Date: Sat Jan 28 17:08:40 2017
New Revision: 312929
URL: https://svnweb.freebsd.org/changeset/base/312929

Log:
  Garbage collect IFT_IEEE80211 (but leave the define for possible reuse)
  
  This interface type ("a parent interface of wlanX") is not used since
  r287197
  
  Reviewed by:	adrian, glebius
  Differential Revision:	https://reviews.freebsd.org/D9308

Modified:
  head/sys/net/if.c
  head/sys/net/if_types.h
  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/net/if.c
==============================================================================
--- head/sys/net/if.c	Sat Jan 28 16:40:51 2017	(r312928)
+++ head/sys/net/if.c	Sat Jan 28 17:08:40 2017	(r312929)
@@ -3530,7 +3530,6 @@ if_setlladdr(struct ifnet *ifp, const u_
 	case IFT_BRIDGE:
 	case IFT_ARCNET:
 	case IFT_IEEE8023ADLAG:
-	case IFT_IEEE80211:
 		bcopy(lladdr, LLADDR(sdl), len);
 		ifa_free(ifa);
 		break;

Modified: head/sys/net/if_types.h
==============================================================================
--- head/sys/net/if_types.h	Sat Jan 28 16:40:51 2017	(r312928)
+++ head/sys/net/if_types.h	Sat Jan 28 17:08:40 2017	(r312929)
@@ -113,7 +113,7 @@ typedef enum {
 	IFT_QLLC	= 0x44,		/* SNA QLLC			*/
 	IFT_FASTETHERFX	= 0x45,		/* Fast Ethernet (100BaseFX)	*/
 	IFT_CHANNEL	= 0x46,		/* channel			*/
-	IFT_IEEE80211	= 0x47,		/* radio spread spectrum	*/
+	IFT_IEEE80211	= 0x47,		/* radio spread spectrum (unused) */
 	IFT_IBM370PARCHAN = 0x48,	/* IBM System 360/370 OEMI Channel */
 	IFT_ESCON	= 0x49,		/* IBM Enterprise Systems Connection */
 	IFT_DLSW	= 0x4a,		/* Data Link Switching */

Modified: head/sys/netinet6/in6.c
==============================================================================
--- head/sys/netinet6/in6.c	Sat Jan 28 16:40:51 2017	(r312928)
+++ head/sys/netinet6/in6.c	Sat Jan 28 17:08:40 2017	(r312929)
@@ -1962,7 +1962,6 @@ in6_if2idlen(struct ifnet *ifp)
 	case IFT_ETHER:		/* RFC2464 */
 	case IFT_PROPVIRTUAL:	/* XXX: no RFC. treat it as ether */
 	case IFT_L2VLAN:	/* ditto */
-	case IFT_IEEE80211:	/* ditto */
 	case IFT_BRIDGE:	/* bridge(4) only does Ethernet-like links */
 	case IFT_INFINIBAND:
 		return (64);

Modified: head/sys/netinet6/in6_ifattach.c
==============================================================================
--- head/sys/netinet6/in6_ifattach.c	Sat Jan 28 16:40:51 2017	(r312928)
+++ head/sys/netinet6/in6_ifattach.c	Sat Jan 28 17:08:40 2017	(r312929)
@@ -276,7 +276,6 @@ found:
 	case IFT_ISO88025:
 	case IFT_ATM:
 	case IFT_IEEE1394:
-	case IFT_IEEE80211:
 		/* IEEE802/EUI64 cases - what others? */
 		/* IEEE1394 uses 16byte length address starting with EUI64 */
 		if (addrlen > 8)

Modified: head/sys/netinet6/nd6.c
==============================================================================
--- head/sys/netinet6/nd6.c	Sat Jan 28 16:40:51 2017	(r312928)
+++ head/sys/netinet6/nd6.c	Sat Jan 28 17:08:40 2017	(r312929)
@@ -2259,7 +2259,6 @@ nd6_resolve(struct ifnet *ifp, int is_gw
 		case IFT_ETHER:
 		case IFT_FDDI:
 		case IFT_L2VLAN:
-		case IFT_IEEE80211:
 		case IFT_BRIDGE:
 		case IFT_ISO88025:
 			ETHER_MAP_IPV6_MULTICAST(&dst6->sin6_addr,
@@ -2527,7 +2526,6 @@ nd6_need_cache(struct ifnet *ifp)
 	case IFT_FDDI:
 	case IFT_IEEE1394:
 	case IFT_L2VLAN:
-	case IFT_IEEE80211:
 	case IFT_INFINIBAND:
 	case IFT_BRIDGE:
 	case IFT_PROPVIRTUAL:

Modified: head/sys/netinet6/nd6_nbr.c
==============================================================================
--- head/sys/netinet6/nd6_nbr.c	Sat Jan 28 16:40:51 2017	(r312928)
+++ head/sys/netinet6/nd6_nbr.c	Sat Jan 28 17:08:40 2017	(r312929)
@@ -1086,7 +1086,6 @@ nd6_ifptomac(struct ifnet *ifp)
 	case IFT_FDDI:
 	case IFT_IEEE1394:
 	case IFT_L2VLAN:
-	case IFT_IEEE80211:
 	case IFT_INFINIBAND:
 	case IFT_BRIDGE:
 	case IFT_ISO88025:
@@ -1457,7 +1456,6 @@ nd6_dad_duplicated(struct ifaddr *ifa, s
 		case IFT_FDDI:
 		case IFT_ATM:
 		case IFT_IEEE1394:
-		case IFT_IEEE80211:
 		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 Jan 28 16:40:51 2017	(r312928)
+++ head/usr.sbin/rtsold/if.c	Sat Jan 28 17:08:40 2017	(r312929)
@@ -247,7 +247,6 @@ lladdropt_length(struct sockaddr_dl *sdl
 {
 	switch (sdl->sdl_type) {
 	case IFT_ETHER:
-	case IFT_IEEE80211:
 		return (ROUNDUP8(ETHER_ADDR_LEN + 2));
 	default:
 		return (0);
@@ -263,7 +262,6 @@ lladdropt_fill(struct sockaddr_dl *sdl, 
 
 	switch (sdl->sdl_type) {
 	case IFT_ETHER:
-	case IFT_IEEE80211:
 		ndopt->nd_opt_len = (ROUNDUP8(ETHER_ADDR_LEN + 2)) >> 3;
 		addr = (char *)(ndopt + 1);
 		memcpy(addr, LLADDR(sdl), ETHER_ADDR_LEN);