Merge branch 'delete-tokenring' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux

1 files changed, 0 insertions, 2 deletions

diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c
index 8ec009c0b2bc..8f6411c97189 100644
--- a/net/ipv6/addrconf.c
+++ b/net/ipv6/addrconf.c
@@ -1573,7 +1573,6 @@ static int ipv6_generate_eui64(u8 *eui, struct net_device *dev)
         switch (dev->type) {
         case ARPHRD_ETHER:
         case ARPHRD_FDDI:
-        case ARPHRD_IEEE802_TR:
                 return addrconf_ifid_eui48(eui, dev);
         case ARPHRD_ARCNET:
                 return addrconf_ifid_arcnet(eui, dev);
@@ -2441,7 +2440,6 @@ static void addrconf_dev_config(struct net_device *dev)
 
         if ((dev->type != ARPHRD_ETHER) &&
             (dev->type != ARPHRD_FDDI) &&
-            (dev->type != ARPHRD_IEEE802_TR) &&
             (dev->type != ARPHRD_ARCNET) &&
             (dev->type != ARPHRD_INFINIBAND) &&
             (dev->type != ARPHRD_IEEE802154)) {