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

16 files changed, 20 insertions, 869 deletions

diff --git a/net/802/Makefile b/net/802/Makefile
index 7893d679910c..a30d6e385aed 100644
--- a/net/802/Makefile
+++ b/net/802/Makefile
@@ -4,7 +4,6 @@
 
 # Check the p8022 selections against net/core/Makefile.
 obj-$(CONFIG_LLC)       += p8022.o psnap.o
-obj-$(CONFIG_TR)        += p8022.o psnap.o tr.o
 obj-$(CONFIG_NET_FC)    +=                 fc.o
 obj-$(CONFIG_FDDI)      +=                 fddi.o
 obj-$(CONFIG_HIPPI)     +=                 hippi.o
diff --git a/net/802/p8022.c b/net/802/p8022.c
index 7f353c4f437a..0bda8de7df51 100644
--- a/net/802/p8022.c
+++ b/net/802/p8022.c
@@ -1,6 +1,5 @@
 /*
- *      NET3:   Support for 802.2 demultiplexing off Ethernet (Token ring
- *              is kept separate see p8022tr.c)
+ *      NET3:   Support for 802.2 demultiplexing off Ethernet
  *              This program is free software; you can redistribute it and/or
  *              modify it under the terms of the GNU General Public License
  *              as published by the Free Software Foundation; either version
diff --git a/net/802/tr.c b/net/802/tr.c
deleted file mode 100644
index 30a352ed09b1..000000000000
--- a/net/802/tr.c
+++ /dev/null
@@ -1,670 +0,0 @@
-/*
- * NET3:        Token ring device handling subroutines
- *
- *              This program is free software; you can redistribute it and/or
- *              modify it under the terms of the GNU General Public License
- *              as published by the Free Software Foundation; either version
- *              2 of the License, or (at your option) any later version.
- *
- * Fixes:       3 Feb 97 Paul Norton <pnorton@cts.com> Minor routing fixes.
- *              Added rif table to /proc/net/tr_rif and rif timeout to
- *              /proc/sys/net/token-ring/rif_timeout.
- *              22 Jun 98 Paul Norton <p.norton@computer.org> Rearranged
- *              tr_header and tr_type_trans to handle passing IPX SNAP and
- *              802.2 through the correct layers. Eliminated tr_reformat.
- *
- */
-
-#include <asm/uaccess.h>
-#include <linux/module.h>
-#include <linux/types.h>
-#include <linux/kernel.h>
-#include <linux/jiffies.h>
-#include <linux/string.h>
-#include <linux/mm.h>
-#include <linux/socket.h>
-#include <linux/in.h>
-#include <linux/inet.h>
-#include <linux/netdevice.h>
-#include <linux/trdevice.h>
-#include <linux/skbuff.h>
-#include <linux/errno.h>
-#include <linux/timer.h>
-#include <linux/net.h>
-#include <linux/proc_fs.h>
-#include <linux/seq_file.h>
-#include <linux/init.h>
-#include <linux/sysctl.h>
-#include <linux/slab.h>
-#include <net/arp.h>
-#include <net/net_namespace.h>
-
-static void tr_add_rif_info(struct trh_hdr *trh, struct net_device *dev);
-static void rif_check_expire(unsigned long dummy);
-
-#define TR_SR_DEBUG 0
-
-/*
- *      Each RIF entry we learn is kept this way
- */
-
-struct rif_cache {
-        unsigned char addr[TR_ALEN];
-        int iface;
-        __be16 rcf;
-        __be16 rseg[8];
-        struct rif_cache *next;
-        unsigned long last_used;
-        unsigned char local_ring;
-};
-
-#define RIF_TABLE_SIZE 32
-
-/*
- *      We hash the RIF cache 32 ways. We do after all have to look it
- *      up a lot.
- */
-
-static struct rif_cache *rif_table[RIF_TABLE_SIZE];
-
-static DEFINE_SPINLOCK(rif_lock);
-
-
-/*
- *      Garbage disposal timer.
- */
-
-static struct timer_list rif_timer;
-
-static int sysctl_tr_rif_timeout = 60*10*HZ;
-
-static inline unsigned long rif_hash(const unsigned char *addr)
-{
-        unsigned long x;
-
-        x = addr[0];
-        x = (x << 2) ^ addr[1];
-        x = (x << 2) ^ addr[2];
-        x = (x << 2) ^ addr[3];
-        x = (x << 2) ^ addr[4];
-        x = (x << 2) ^ addr[5];
-
-        x ^= x >> 8;
-
-        return x & (RIF_TABLE_SIZE - 1);
-}
-
-/*
- *      Put the headers on a token ring packet. Token ring source routing
- *      makes this a little more exciting than on ethernet.
- */
-
-static int tr_header(struct sk_buff *skb, struct net_device *dev,
-                     unsigned short type,
-                     const void *daddr, const void *saddr, unsigned int len)
-{
-        struct trh_hdr *trh;
-        int hdr_len;
-
-        /*
-         * Add the 802.2 SNAP header if IP as the IPv4/IPv6 code calls
-         * dev->hard_header directly.
-         */
-        if (type == ETH_P_IP || type == ETH_P_IPV6 || type == ETH_P_ARP)
-        {
-                struct trllc *trllc;
-
-                hdr_len = sizeof(struct trh_hdr) + sizeof(struct trllc);
-                trh = (struct trh_hdr *)skb_push(skb, hdr_len);
-                trllc = (struct trllc *)(trh+1);
-                trllc->dsap = trllc->ssap = EXTENDED_SAP;
-                trllc->llc = UI_CMD;
-                trllc->protid[0] = trllc->protid[1] = trllc->protid[2] = 0x00;
-                trllc->ethertype = htons(type);
-        }
-        else
-        {
-                hdr_len = sizeof(struct trh_hdr);
-                trh = (struct trh_hdr *)skb_push(skb, hdr_len);
-        }
-
-        trh->ac=AC;
-        trh->fc=LLC_FRAME;
-
-        if(saddr)
-                memcpy(trh->saddr,saddr,dev->addr_len);
-        else
-                memcpy(trh->saddr,dev->dev_addr,dev->addr_len);
-
-        /*
-         *      Build the destination and then source route the frame
-         */
-
-        if(daddr)
-        {
-                memcpy(trh->daddr,daddr,dev->addr_len);
-                tr_source_route(skb, trh, dev);
-                return hdr_len;
-        }
-
-        return -hdr_len;
-}
-
-/*
- *      A neighbour discovery of some species (eg arp) has completed. We
- *      can now send the packet.
- */
-
-static int tr_rebuild_header(struct sk_buff *skb)
-{
-        struct trh_hdr *trh=(struct trh_hdr *)skb->data;
-        struct trllc *trllc=(struct trllc *)(skb->data+sizeof(struct trh_hdr));
-        struct net_device *dev = skb->dev;
-
-        /*
-         *      FIXME: We don't yet support IPv6 over token rings
-         */
-
-        if(trllc->ethertype != htons(ETH_P_IP)) {
-                printk("tr_rebuild_header: Don't know how to resolve type %04X addresses ?\n", ntohs(trllc->ethertype));
-                return 0;
-        }
-
-#ifdef CONFIG_INET
-        if(arp_find(trh->daddr, skb)) {
-                        return 1;
-        }
-        else
-#endif
-        {
-                tr_source_route(skb,trh,dev);
-                return 0;
-        }
-}
-
-/*
- *      Some of this is a bit hackish. We intercept RIF information
- *      used for source routing. We also grab IP directly and don't feed
- *      it via SNAP.
- */
-
-__be16 tr_type_trans(struct sk_buff *skb, struct net_device *dev)
-{
-
-        struct trh_hdr *trh;
-        struct trllc *trllc;
-        unsigned int riflen=0;
-
-        skb->dev = dev;
-        skb_reset_mac_header(skb);
-        trh = tr_hdr(skb);
-
-        if(trh->saddr[0] & TR_RII)
-                riflen = (ntohs(trh->rcf) & TR_RCF_LEN_MASK) >> 8;
-
-        trllc = (struct trllc *)(skb->data+sizeof(struct trh_hdr)-TR_MAXRIFLEN+riflen);
-
-        skb_pull(skb,sizeof(struct trh_hdr)-TR_MAXRIFLEN+riflen);
-
-        if(*trh->daddr & 0x80)
-        {
-                if(!memcmp(trh->daddr,dev->broadcast,TR_ALEN))
-                        skb->pkt_type=PACKET_BROADCAST;
-                else
-                        skb->pkt_type=PACKET_MULTICAST;
-        }
-        else if ( (trh->daddr[0] & 0x01) && (trh->daddr[1] & 0x00) && (trh->daddr[2] & 0x5E))
-        {
-                skb->pkt_type=PACKET_MULTICAST;
-        }
-        else if(dev->flags & IFF_PROMISC)
-        {
-                if(memcmp(trh->daddr, dev->dev_addr, TR_ALEN))
-                        skb->pkt_type=PACKET_OTHERHOST;
-        }
-
-        if ((skb->pkt_type != PACKET_BROADCAST) &&
-            (skb->pkt_type != PACKET_MULTICAST))
-                tr_add_rif_info(trh,dev) ;
-
-        /*
-         * Strip the SNAP header from ARP packets since we don't
-         * pass them through to the 802.2/SNAP layers.
-         */
-
-        if (trllc->dsap == EXTENDED_SAP &&
-            (trllc->ethertype == htons(ETH_P_IP) ||
-             trllc->ethertype == htons(ETH_P_IPV6) ||
-             trllc->ethertype == htons(ETH_P_ARP)))
-        {
-                skb_pull(skb, sizeof(struct trllc));
-                return trllc->ethertype;
-        }
-
-        return htons(ETH_P_TR_802_2);
-}
-
-/*
- *      We try to do source routing...
- */
-
-void tr_source_route(struct sk_buff *skb,struct trh_hdr *trh,
-                     struct net_device *dev)
-{
-        int slack;
-        unsigned int hash;
-        struct rif_cache *entry;
-        unsigned char *olddata;
-        unsigned long flags;
-        static const unsigned char mcast_func_addr[]
-                = {0xC0,0x00,0x00,0x04,0x00,0x00};
-
-        spin_lock_irqsave(&rif_lock, flags);
-
-        /*
-         *      Broadcasts are single route as stated in RFC 1042
-         */
-        if( (!memcmp(&(trh->daddr[0]),&(dev->broadcast[0]),TR_ALEN)) ||
-            (!memcmp(&(trh->daddr[0]),&(mcast_func_addr[0]), TR_ALEN))  )
-        {
-                trh->rcf=htons((((sizeof(trh->rcf)) << 8) & TR_RCF_LEN_MASK)
-                               | TR_RCF_FRAME2K | TR_RCF_LIMITED_BROADCAST);
-                trh->saddr[0]|=TR_RII;
-        }
-        else
-        {
-                hash = rif_hash(trh->daddr);
-                /*
-                 *      Walk the hash table and look for an entry
-                 */
-                for(entry=rif_table[hash];entry && memcmp(&(entry->addr[0]),&(trh->daddr[0]),TR_ALEN);entry=entry->next);
-
-                /*
-                 *      If we found an entry we can route the frame.
-                 */
-                if(entry)
-                {
-#if TR_SR_DEBUG
-printk("source routing for %pM\n", trh->daddr);
-#endif
-                        if(!entry->local_ring && (ntohs(entry->rcf) & TR_RCF_LEN_MASK) >> 8)
-                        {
-                                trh->rcf=entry->rcf;
-                                memcpy(&trh->rseg[0],&entry->rseg[0],8*sizeof(unsigned short));
-                                trh->rcf^=htons(TR_RCF_DIR_BIT);
-                                trh->rcf&=htons(0x1fff);        /* Issam Chehab <ichehab@madge1.demon.co.uk> */
-
-                                trh->saddr[0]|=TR_RII;
-#if TR_SR_DEBUG
-                                printk("entry found with rcf %04x\n", entry->rcf);
-                        }
-                        else
-                        {
-                                printk("entry found but without rcf length, local=%02x\n", entry->local_ring);
-#endif
-                        }
-                        entry->last_used=jiffies;
-                }
-                else
-                {
-                        /*
-                         *      Without the information we simply have to shout
-                         *      on the wire. The replies should rapidly clean this
-                         *      situation up.
-                         */
-                        trh->rcf=htons((((sizeof(trh->rcf)) << 8) & TR_RCF_LEN_MASK)
-                                       | TR_RCF_FRAME2K | TR_RCF_LIMITED_BROADCAST);
-                        trh->saddr[0]|=TR_RII;
-#if TR_SR_DEBUG
-                        printk("no entry in rif table found - broadcasting frame\n");
-#endif
-                }
-        }
-
-        /* Compress the RIF here so we don't have to do it in the driver(s) */
-        if (!(trh->saddr[0] & 0x80))
-                slack = 18;
-        else
-                slack = 18 - ((ntohs(trh->rcf) & TR_RCF_LEN_MASK)>>8);
-        olddata = skb->data;
-        spin_unlock_irqrestore(&rif_lock, flags);
-
-        skb_pull(skb, slack);
-        memmove(skb->data, olddata, sizeof(struct trh_hdr) - slack);
-}
-
-/*
- *      We have learned some new RIF information for our source
- *      routing.
- */
-
-static void tr_add_rif_info(struct trh_hdr *trh, struct net_device *dev)
-{
-        unsigned int hash, rii_p = 0;
-        unsigned long flags;
-        struct rif_cache *entry;
-        unsigned char saddr0;
-
-        spin_lock_irqsave(&rif_lock, flags);
-        saddr0 = trh->saddr[0];
-
-        /*
-         *      Firstly see if the entry exists
-         */
-
-        if(trh->saddr[0] & TR_RII)
-        {
-                trh->saddr[0]&=0x7f;
-                if (((ntohs(trh->rcf) & TR_RCF_LEN_MASK) >> 8) > 2)
-                {
-                        rii_p = 1;
-                }
-        }
-
-        hash = rif_hash(trh->saddr);
-        for(entry=rif_table[hash];entry && memcmp(&(entry->addr[0]),&(trh->saddr[0]),TR_ALEN);entry=entry->next);
-
-        if(entry==NULL)
-        {
-#if TR_SR_DEBUG
-                printk("adding rif_entry: addr:%pM rcf:%04X\n",
-                       trh->saddr, ntohs(trh->rcf));
-#endif
-                /*
-                 *      Allocate our new entry. A failure to allocate loses
-                 *      use the information. This is harmless.
-                 *
-                 *      FIXME: We ought to keep some kind of cache size
-                 *      limiting and adjust the timers to suit.
-                 */
-                entry=kmalloc(sizeof(struct rif_cache),GFP_ATOMIC);
-
-                if(!entry)
-                {
-                        printk(KERN_DEBUG "tr.c: Couldn't malloc rif cache entry !\n");
-                        spin_unlock_irqrestore(&rif_lock, flags);
-                        return;
-                }
-
-                memcpy(&(entry->addr[0]),&(trh->saddr[0]),TR_ALEN);
-                entry->iface = dev->ifindex;
-                entry->next=rif_table[hash];
-                entry->last_used=jiffies;
-                rif_table[hash]=entry;
-
-                if (rii_p)
-                {
-                        entry->rcf = trh->rcf & htons((unsigned short)~TR_RCF_BROADCAST_MASK);
-                        memcpy(&(entry->rseg[0]),&(trh->rseg[0]),8*sizeof(unsigned short));
-                        entry->local_ring = 0;
-                }
-                else
-                {
-                        entry->local_ring = 1;
-                }
-        }
-        else    /* Y. Tahara added */
-        {
-                /*
-                 *      Update existing entries
-                 */
-                if (!entry->local_ring)
-                    if (entry->rcf != (trh->rcf & htons((unsigned short)~TR_RCF_BROADCAST_MASK)) &&
-                         !(trh->rcf & htons(TR_RCF_BROADCAST_MASK)))
-                    {
-#if TR_SR_DEBUG
-printk("updating rif_entry: addr:%pM rcf:%04X\n",
-                trh->saddr, ntohs(trh->rcf));
-#endif
-                            entry->rcf = trh->rcf & htons((unsigned short)~TR_RCF_BROADCAST_MASK);
-                            memcpy(&(entry->rseg[0]),&(trh->rseg[0]),8*sizeof(unsigned short));
-                    }
-                entry->last_used=jiffies;
-        }
-        trh->saddr[0]=saddr0; /* put the routing indicator back for tcpdump */
-        spin_unlock_irqrestore(&rif_lock, flags);
-}
-
-/*
- *      Scan the cache with a timer and see what we need to throw out.
- */
-
-static void rif_check_expire(unsigned long dummy)
-{
-        int i;
-        unsigned long flags, next_interval = jiffies + sysctl_tr_rif_timeout/2;
-
-        spin_lock_irqsave(&rif_lock, flags);
-
-        for(i =0; i < RIF_TABLE_SIZE; i++) {
-                struct rif_cache *entry, **pentry;
-
-                pentry = rif_table+i;
-                while((entry=*pentry) != NULL) {
-                        unsigned long expires
-                                = entry->last_used + sysctl_tr_rif_timeout;
-
-                        if (time_before_eq(expires, jiffies)) {
-                                *pentry = entry->next;
-                                kfree(entry);
-                        } else {
-                                pentry = &entry->next;
-
-                                if (time_before(expires, next_interval))
-                                        next_interval = expires;
-                        }
-                }
-        }
-
-        spin_unlock_irqrestore(&rif_lock, flags);
-
-        mod_timer(&rif_timer, next_interval);
-
-}
-
-/*
- *      Generate the /proc/net information for the token ring RIF
- *      routing.
- */
-
-#ifdef CONFIG_PROC_FS
-
-static struct rif_cache *rif_get_idx(loff_t pos)
-{
-        int i;
-        struct rif_cache *entry;
-        loff_t off = 0;
-
-        for(i = 0; i < RIF_TABLE_SIZE; i++)
-                for(entry = rif_table[i]; entry; entry = entry->next) {
-                        if (off == pos)
-                                return entry;
-                        ++off;
-                }
-
-        return NULL;
-}
-
-static void *rif_seq_start(struct seq_file *seq, loff_t *pos)
-        __acquires(&rif_lock)
-{
-        spin_lock_irq(&rif_lock);
-
-        return *pos ? rif_get_idx(*pos - 1) : SEQ_START_TOKEN;
-}
-
-static void *rif_seq_next(struct seq_file *seq, void *v, loff_t *pos)
-{
-        int i;
-        struct rif_cache *ent = v;
-
-        ++*pos;
-
-        if (v == SEQ_START_TOKEN) {
-                i = -1;
-                goto scan;
-        }
-
-        if (ent->next)
-                return ent->next;
-
-        i = rif_hash(ent->addr);
- scan:
-        while (++i < RIF_TABLE_SIZE) {
-                if ((ent = rif_table[i]) != NULL)
-                        return ent;
-        }
-        return NULL;
-}
-
-static void rif_seq_stop(struct seq_file *seq, void *v)
-        __releases(&rif_lock)
-{
-        spin_unlock_irq(&rif_lock);
-}
-
-static int rif_seq_show(struct seq_file *seq, void *v)
-{
-        int j, rcf_len, segment, brdgnmb;
-        struct rif_cache *entry = v;
-
-        if (v == SEQ_START_TOKEN)
-                seq_puts(seq,
-                     "if     TR address       TTL   rcf   routing segments\n");
-        else {
-                struct net_device *dev = dev_get_by_index(&init_net, entry->iface);
-                long ttl = (long) (entry->last_used + sysctl_tr_rif_timeout)
-                                - (long) jiffies;
-
-                seq_printf(seq, "%s %pM %7li ",
-                           dev?dev->name:"?",
-                           entry->addr,
-                           ttl/HZ);
-
-                        if (entry->local_ring)
-                                seq_puts(seq, "local\n");
-                        else {
-
-                                seq_printf(seq, "%04X", ntohs(entry->rcf));
-                                rcf_len = ((ntohs(entry->rcf) & TR_RCF_LEN_MASK)>>8)-2;
-                                if (rcf_len)
-                                        rcf_len >>= 1;
-                                for(j = 1; j < rcf_len; j++) {
-                                        if(j==1) {
-                                                segment=ntohs(entry->rseg[j-1])>>4;
-                                                seq_printf(seq,"  %03X",segment);
-                                        }
-
-                                        segment=ntohs(entry->rseg[j])>>4;
-                                        brdgnmb=ntohs(entry->rseg[j-1])&0x00f;
-                                        seq_printf(seq,"-%01X-%03X",brdgnmb,segment);
-                                }
-                                seq_putc(seq, '\n');
-                        }
-
-                if (dev)
-                        dev_put(dev);
-                }
-        return 0;
-}
-
-
-static const struct seq_operations rif_seq_ops = {
-        .start = rif_seq_start,
-        .next  = rif_seq_next,
-        .stop  = rif_seq_stop,
-        .show  = rif_seq_show,
-};
-
-static int rif_seq_open(struct inode *inode, struct file *file)
-{
-        return seq_open(file, &rif_seq_ops);
-}
-
-static const struct file_operations rif_seq_fops = {
-        .owner   = THIS_MODULE,
-        .open    = rif_seq_open,
-        .read    = seq_read,
-        .llseek  = seq_lseek,
-        .release = seq_release,
-};
-
-#endif
-
-static const struct header_ops tr_header_ops = {
-        .create = tr_header,
-        .rebuild= tr_rebuild_header,
-};
-
-static void tr_setup(struct net_device *dev)
-{
-        /*
-         *      Configure and register
-         */
-
-        dev->header_ops = &tr_header_ops;
-
-        dev->type               = ARPHRD_IEEE802_TR;
-        dev->hard_header_len    = TR_HLEN;
-        dev->mtu                = 2000;
-        dev->addr_len           = TR_ALEN;
-        dev->tx_queue_len       = 100;  /* Long queues on tr */
-
-        memset(dev->broadcast,0xFF, TR_ALEN);
-
-        /* New-style flags. */
-        dev->flags              = IFF_BROADCAST | IFF_MULTICAST ;
-}
-
-/**
- * alloc_trdev - Register token ring device
- * @sizeof_priv: Size of additional driver-private structure to be allocated
- *      for this token ring device
- *
- * Fill in the fields of the device structure with token ring-generic values.
- *
- * Constructs a new net device, complete with a private data area of
- * size @sizeof_priv.  A 32-byte (not bit) alignment is enforced for
- * this private data area.
- */
-struct net_device *alloc_trdev(int sizeof_priv)
-{
-        return alloc_netdev(sizeof_priv, "tr%d", tr_setup);
-}
-
-#ifdef CONFIG_SYSCTL
-static struct ctl_table tr_table[] = {
-        {
-                .procname       = "rif_timeout",
-                .data           = &sysctl_tr_rif_timeout,
-                .maxlen         = sizeof(int),
-                .mode           = 0644,
-                .proc_handler   = proc_dointvec
-        },
-        { },
-};
-#endif
-
-/*
- *      Called during bootup.  We don't actually have to initialise
- *      too much for this.
- */
-
-static int __init rif_init(void)
-{
-        rif_timer.expires  = jiffies + sysctl_tr_rif_timeout;
-        setup_timer(&rif_timer, rif_check_expire, 0);
-        add_timer(&rif_timer);
-#ifdef CONFIG_SYSCTL
-        register_net_sysctl(&init_net, "net/token-ring", tr_table);
-#endif
-        proc_net_fops_create(&init_net, "tr_rif", S_IRUGO, &rif_seq_fops);
-        return 0;
-}
-
-module_init(rif_init);
-
-EXPORT_SYMBOL(tr_type_trans);
-EXPORT_SYMBOL(alloc_trdev);
-
-MODULE_LICENSE("GPL");
diff --git a/net/atm/lec.c b/net/atm/lec.c
index bb35cb76b3af..a7d172105c99 100644
--- a/net/atm/lec.c
+++ b/net/atm/lec.c
@@ -26,11 +26,6 @@
 #include <linux/spinlock.h>
 #include <linux/seq_file.h>
 
-/* TokenRing if needed */
-#ifdef CONFIG_TR
-#include <linux/trdevice.h>
-#endif
-
 /* And atm device */
 #include <linux/atmdev.h>
 #include <linux/atmlec.h>
@@ -163,50 +158,6 @@ static void lec_handle_bridge(struct sk_buff *skb, struct net_device *dev)
 #endif /* defined(CONFIG_BRIDGE) || defined(CONFIG_BRIDGE_MODULE) */
 
 /*
- * Modelled after tr_type_trans
- * All multicast and ARE or STE frames go to BUS.
- * Non source routed frames go by destination address.
- * Last hop source routed frames go by destination address.
- * Not last hop source routed frames go by _next_ route descriptor.
- * Returns pointer to destination MAC address or fills in rdesc
- * and returns NULL.
- */
-#ifdef CONFIG_TR
-static unsigned char *get_tr_dst(unsigned char *packet, unsigned char *rdesc)
-{
-        struct trh_hdr *trh;
-        unsigned int riflen, num_rdsc;
-
-        trh = (struct trh_hdr *)packet;
-        if (trh->daddr[0] & (uint8_t) 0x80)
-                return bus_mac; /* multicast */
-
-        if (trh->saddr[0] & TR_RII) {
-                riflen = (ntohs(trh->rcf) & TR_RCF_LEN_MASK) >> 8;
-                if ((ntohs(trh->rcf) >> 13) != 0)
-                        return bus_mac; /* ARE or STE */
-        } else
-                return trh->daddr;      /* not source routed */
-
-        if (riflen < 6)
-                return trh->daddr;      /* last hop, source routed */
-
-        /* riflen is 6 or more, packet has more than one route descriptor */
-        num_rdsc = (riflen / 2) - 1;
-        memset(rdesc, 0, ETH_ALEN);
-        /* offset 4 comes from LAN destination field in LE control frames */
-        if (trh->rcf & htons((uint16_t) TR_RCF_DIR_BIT))
-                memcpy(&rdesc[4], &trh->rseg[num_rdsc - 2], sizeof(__be16));
-        else {
-                memcpy(&rdesc[4], &trh->rseg[1], sizeof(__be16));
-                rdesc[5] = ((ntohs(trh->rseg[0]) & 0x000f) | (rdesc[5] & 0xf0));
-        }
-
-        return NULL;
-}
-#endif /* CONFIG_TR */
-
-/*
  * Open/initialize the netdevice. This is called (in the current kernel)
  * sometime after booting when the 'ifconfig' program is run.
  *
@@ -257,9 +208,6 @@ static netdev_tx_t lec_start_xmit(struct sk_buff *skb,
         struct lec_arp_table *entry;
         unsigned char *dst;
         int min_frame_size;
-#ifdef CONFIG_TR
-        unsigned char rdesc[ETH_ALEN];  /* Token Ring route descriptor */
-#endif
         int is_rdesc;
 
         pr_debug("called\n");
@@ -290,24 +238,10 @@ static netdev_tx_t lec_start_xmit(struct sk_buff *skb,
         }
         skb_push(skb, 2);
 
-        /* Put le header to place, works for TokenRing too */
+        /* Put le header to place */
         lec_h = (struct lecdatahdr_8023 *)skb->data;
         lec_h->le_header = htons(priv->lecid);
 
-#ifdef CONFIG_TR
-        /*
-         * Ugly. Use this to realign Token Ring packets for
-         * e.g. PCA-200E driver.
-         */
-        if (priv->is_trdev) {
-                skb2 = skb_realloc_headroom(skb, LEC_HEADER_LEN);
-                kfree_skb(skb);
-                if (skb2 == NULL)
-                        return NETDEV_TX_OK;
-                skb = skb2;
-        }
-#endif
-
 #if DUMP_PACKETS >= 2
 #define MAX_DUMP_SKB 99
 #elif DUMP_PACKETS >= 1
@@ -321,12 +255,7 @@ static netdev_tx_t lec_start_xmit(struct sk_buff *skb,
 #endif /* DUMP_PACKETS >= 1 */
 
         /* Minimum ethernet-frame size */
-#ifdef CONFIG_TR
-        if (priv->is_trdev)
-                min_frame_size = LEC_MINIMUM_8025_SIZE;
-        else
-#endif
-                min_frame_size = LEC_MINIMUM_8023_SIZE;
+        min_frame_size = LEC_MINIMUM_8023_SIZE;
         if (skb->len < min_frame_size) {
                 if ((skb->len + skb_tailroom(skb)) < min_frame_size) {
                         skb2 = skb_copy_expand(skb, 0,
@@ -345,15 +274,6 @@ static netdev_tx_t lec_start_xmit(struct sk_buff *skb,
         /* Send to right vcc */
         is_rdesc = 0;
         dst = lec_h->h_dest;
-#ifdef CONFIG_TR
-        if (priv->is_trdev) {
-                dst = get_tr_dst(skb->data + 2, rdesc);
-                if (dst == NULL) {
-                        dst = rdesc;
-                        is_rdesc = 1;
-                }
-        }
-#endif
         entry = NULL;
         vcc = lec_arp_resolve(priv, dst, is_rdesc, &entry);
         pr_debug("%s:vcc:%p vcc_flags:%lx, entry:%p\n",
@@ -710,12 +630,7 @@ static void lec_push(struct atm_vcc *vcc, struct sk_buff *skb)
                         dev_kfree_skb(skb);
                         return;
                 }
-#ifdef CONFIG_TR
-                if (priv->is_trdev)
-                        dst = ((struct lecdatahdr_8025 *)skb->data)->h_dest;
-                else
-#endif
-                        dst = ((struct lecdatahdr_8023 *)skb->data)->h_dest;
+                dst = ((struct lecdatahdr_8023 *)skb->data)->h_dest;
 
                 /*
                  * If this is a Data Direct VCC, and the VCC does not match
@@ -723,16 +638,7 @@ static void lec_push(struct atm_vcc *vcc, struct sk_buff *skb)
                  */
                 spin_lock_irqsave(&priv->lec_arp_lock, flags);
                 if (lec_is_data_direct(vcc)) {
-#ifdef CONFIG_TR
-                        if (priv->is_trdev)
-                                src =
-                                    ((struct lecdatahdr_8025 *)skb->data)->
-                                    h_source;
-                        else
-#endif
-                                src =
-                                    ((struct lecdatahdr_8023 *)skb->data)->
-                                    h_source;
+                        src = ((struct lecdatahdr_8023 *)skb->data)->h_source;
                         entry = lec_arp_find(priv, src);
                         if (entry && entry->vcc != vcc) {
                                 lec_arp_remove(priv, entry);
@@ -750,12 +656,7 @@ static void lec_push(struct atm_vcc *vcc, struct sk_buff *skb)
                 if (!hlist_empty(&priv->lec_arp_empty_ones))
                         lec_arp_check_empties(priv, vcc, skb);
                 skb_pull(skb, 2);       /* skip lec_id */
-#ifdef CONFIG_TR
-                if (priv->is_trdev)
-                        skb->protocol = tr_type_trans(skb, dev);
-                else
-#endif
-                        skb->protocol = eth_type_trans(skb, dev);
+                skb->protocol = eth_type_trans(skb, dev);
                 dev->stats.rx_packets++;
                 dev->stats.rx_bytes += skb->len;
                 memset(ATM_SKB(skb), 0, sizeof(struct atm_skb_data));
@@ -827,27 +728,13 @@ static int lecd_attach(struct atm_vcc *vcc, int arg)
                 i = 0;
         else
                 i = arg;
-#ifdef CONFIG_TR
         if (arg >= MAX_LEC_ITF)
                 return -EINVAL;
-#else                           /* Reserve the top NUM_TR_DEVS for TR */
-        if (arg >= (MAX_LEC_ITF - NUM_TR_DEVS))
-                return -EINVAL;
-#endif
         if (!dev_lec[i]) {
-                int is_trdev, size;
-
-                is_trdev = 0;
-                if (i >= (MAX_LEC_ITF - NUM_TR_DEVS))
-                        is_trdev = 1;
+                int size;
 
                 size = sizeof(struct lec_priv);
-#ifdef CONFIG_TR
-                if (is_trdev)
-                        dev_lec[i] = alloc_trdev(size);
-                else
-#endif
-                        dev_lec[i] = alloc_etherdev(size);
+                dev_lec[i] = alloc_etherdev(size);
                 if (!dev_lec[i])
                         return -ENOMEM;
                 dev_lec[i]->netdev_ops = &lec_netdev_ops;
@@ -858,7 +745,6 @@ static int lecd_attach(struct atm_vcc *vcc, int arg)
                 }
 
                 priv = netdev_priv(dev_lec[i]);
-                priv->is_trdev = is_trdev;
         } else {
                 priv = netdev_priv(dev_lec[i]);
                 if (priv->lecd)
@@ -2372,15 +2258,7 @@ lec_arp_check_empties(struct lec_priv *priv,
         struct hlist_node *node, *next;
         struct lec_arp_table *entry, *tmp;
         struct lecdatahdr_8023 *hdr = (struct lecdatahdr_8023 *)skb->data;
-        unsigned char *src;
-#ifdef CONFIG_TR
-        struct lecdatahdr_8025 *tr_hdr = (struct lecdatahdr_8025 *)skb->data;
-
-        if (priv->is_trdev)
-                src = tr_hdr->h_source;
-        else
-#endif
-                src = hdr->h_source;
+        unsigned char *src = hdr->h_source;
 
         spin_lock_irqsave(&priv->lec_arp_lock, flags);
         hlist_for_each_entry_safe(entry, node, next,
diff --git a/net/atm/lec.h b/net/atm/lec.h
index dfc071966463..c730e57de199 100644
--- a/net/atm/lec.h
+++ b/net/atm/lec.h
@@ -142,7 +142,6 @@ struct lec_priv {
         int itfnum;                             /* e.g. 2 for lec2, 5 for lec5 */
         struct lane2_ops *lane2_ops;            /* can be NULL for LANE v1 */
         int is_proxy;                           /* bridge between ATM and Ethernet */
-        int is_trdev;                           /* Device type, 0 = Ethernet, 1 = TokenRing */
 };
 
 struct lec_vcc_priv {
diff --git a/net/core/dev.c b/net/core/dev.c
index 3dd853998d38..66cae6e975d9 100644
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -300,10 +300,9 @@ static const unsigned short netdev_lock_type[] =
          ARPHRD_BIF, ARPHRD_SIT, ARPHRD_IPDDP, ARPHRD_IPGRE,
          ARPHRD_PIMREG, ARPHRD_HIPPI, ARPHRD_ASH, ARPHRD_ECONET,
          ARPHRD_IRDA, ARPHRD_FCPP, ARPHRD_FCAL, ARPHRD_FCPL,
-         ARPHRD_FCFABRIC, ARPHRD_IEEE802_TR, ARPHRD_IEEE80211,
-         ARPHRD_IEEE80211_PRISM, ARPHRD_IEEE80211_RADIOTAP, ARPHRD_PHONET,
-         ARPHRD_PHONET_PIPE, ARPHRD_IEEE802154,
-         ARPHRD_VOID, ARPHRD_NONE};
+         ARPHRD_FCFABRIC, ARPHRD_IEEE80211, ARPHRD_IEEE80211_PRISM,
+         ARPHRD_IEEE80211_RADIOTAP, ARPHRD_PHONET, ARPHRD_PHONET_PIPE,
+         ARPHRD_IEEE802154, ARPHRD_VOID, ARPHRD_NONE};
 
 static const char *const netdev_lock_name[] =
         {"_xmit_NETROM", "_xmit_ETHER", "_xmit_EETHER", "_xmit_AX25",
@@ -318,10 +317,9 @@ static const char *const netdev_lock_name[] =
          "_xmit_BIF", "_xmit_SIT", "_xmit_IPDDP", "_xmit_IPGRE",
          "_xmit_PIMREG", "_xmit_HIPPI", "_xmit_ASH", "_xmit_ECONET",
          "_xmit_IRDA", "_xmit_FCPP", "_xmit_FCAL", "_xmit_FCPL",
-         "_xmit_FCFABRIC", "_xmit_IEEE802_TR", "_xmit_IEEE80211",
-         "_xmit_IEEE80211_PRISM", "_xmit_IEEE80211_RADIOTAP", "_xmit_PHONET",
-         "_xmit_PHONET_PIPE", "_xmit_IEEE802154",
-         "_xmit_VOID", "_xmit_NONE"};
+         "_xmit_FCFABRIC", "_xmit_IEEE80211", "_xmit_IEEE80211_PRISM",
+         "_xmit_IEEE80211_RADIOTAP", "_xmit_PHONET", "_xmit_PHONET_PIPE",
+         "_xmit_IEEE802154", "_xmit_VOID", "_xmit_NONE"};
 
 static struct lock_class_key netdev_xmit_lock_key[ARRAY_SIZE(netdev_lock_type)];
 static struct lock_class_key netdev_addr_lock_key[ARRAY_SIZE(netdev_lock_type)];
diff --git a/net/ipv4/Kconfig b/net/ipv4/Kconfig
index 2c8febd3ebda..20f1cb5c8aba 100644
--- a/net/ipv4/Kconfig
+++ b/net/ipv4/Kconfig
@@ -262,8 +262,8 @@ config ARPD
         bool "IP: ARP daemon support"
         ---help---
           The kernel maintains an internal cache which maps IP addresses to
-          hardware addresses on the local network, so that Ethernet/Token Ring/
-          etc. frames are sent to the proper address on the physical networking
+          hardware addresses on the local network, so that Ethernet
+          frames are sent to the proper address on the physical networking
           layer. Normally, kernel uses the ARP protocol to resolve these
           mappings.
 
diff --git a/net/ipv4/arp.c b/net/ipv4/arp.c
index 3e2bf3dedce5..cda37be02f8d 100644
--- a/net/ipv4/arp.c
+++ b/net/ipv4/arp.c
@@ -91,7 +91,6 @@
 #include <linux/etherdevice.h>
 #include <linux/fddidevice.h>
 #include <linux/if_arp.h>
-#include <linux/trdevice.h>
 #include <linux/skbuff.h>
 #include <linux/proc_fs.h>
 #include <linux/seq_file.h>
@@ -195,9 +194,6 @@ int arp_mc_map(__be32 addr, u8 *haddr, struct net_device *dev, int dir)
         case ARPHRD_IEEE802:
                 ip_eth_mc_map(addr, haddr);
                 return 0;
-        case ARPHRD_IEEE802_TR:
-                ip_tr_mc_map(addr, haddr);
-                return 0;
         case ARPHRD_INFINIBAND:
                 ip_ib_mc_map(addr, dev->broadcast, haddr);
                 return 0;
@@ -649,12 +645,6 @@ struct sk_buff *arp_create(int type, int ptype, __be32 dest_ip,
                 arp->ar_pro = htons(ETH_P_IP);
                 break;
 #endif
-#if IS_ENABLED(CONFIG_TR)
-        case ARPHRD_IEEE802_TR:
-                arp->ar_hrd = htons(ARPHRD_IEEE802);
-                arp->ar_pro = htons(ETH_P_IP);
-                break;
-#endif
         }
 
         arp->ar_hln = dev->addr_len;
@@ -752,11 +742,10 @@ static int arp_process(struct sk_buff *skb)
                         goto out;
                 break;
         case ARPHRD_ETHER:
-        case ARPHRD_IEEE802_TR:
         case ARPHRD_FDDI:
         case ARPHRD_IEEE802:
                 /*
-                 * ETHERNET, Token Ring and Fibre Channel (which are IEEE 802
+                 * ETHERNET, and Fibre Channel (which are IEEE 802
                  * devices, according to RFC 2625) devices will accept ARP
                  * hardware types of either 1 (Ethernet) or 6 (IEEE 802.2).
                  * This is the case also of FDDI, where the RFC 1390 says that
diff --git a/net/ipv4/ipconfig.c b/net/ipv4/ipconfig.c
index 24a3df9890e1..430015010e57 100644
--- a/net/ipv4/ipconfig.c
+++ b/net/ipv4/ipconfig.c
@@ -808,8 +808,6 @@ static void __init ic_bootp_send_if(struct ic_device *d, unsigned long jiffies_d
         b->op = BOOTP_REQUEST;
         if (dev->type < 256) /* check for false types */
                 b->htype = dev->type;
-        else if (dev->type == ARPHRD_IEEE802_TR) /* fix for token ring */
-                b->htype = ARPHRD_IEEE802;
         else if (dev->type == ARPHRD_FDDI)
                 b->htype = ARPHRD_ETHER;
         else {
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)) {
diff --git a/net/ipv6/ndisc.c b/net/ipv6/ndisc.c
index 511e5b4bb610..cbb863d66481 100644
--- a/net/ipv6/ndisc.c
+++ b/net/ipv6/ndisc.c
@@ -327,9 +327,6 @@ int ndisc_mc_map(const struct in6_addr *addr, char *buf, struct net_device *dev,
         case ARPHRD_FDDI:
                 ipv6_eth_mc_map(addr, buf);
                 return 0;
-        case ARPHRD_IEEE802_TR:
-                ipv6_tr_mc_map(addr,buf);
-                return 0;
         case ARPHRD_ARCNET:
                 ipv6_arcnet_mc_map(addr, buf);
                 return 0;
@@ -795,20 +792,6 @@ static void ndisc_recv_ns(struct sk_buff *skb)
 
                 if (ifp->flags & (IFA_F_TENTATIVE|IFA_F_OPTIMISTIC)) {
                         if (dad) {
-                                if (dev->type == ARPHRD_IEEE802_TR) {
-                                        const unsigned char *sadr;
-                                        sadr = skb_mac_header(skb);
-                                        if (((sadr[8] ^ dev->dev_addr[0]) & 0x7f) == 0 &&
-                                            sadr[9] == dev->dev_addr[1] &&
-                                            sadr[10] == dev->dev_addr[2] &&
-                                            sadr[11] == dev->dev_addr[3] &&
-                                            sadr[12] == dev->dev_addr[4] &&
-                                            sadr[13] == dev->dev_addr[5]) {
-                                                /* looped-back to us */
-                                                goto out;
-                                        }
-                                }
-
                                 /*
                                  * We are colliding with another node
                                  * who is doing DAD
diff --git a/net/ipx/af_ipx.c b/net/ipx/af_ipx.c
index 9680226640ef..824d4a3338ae 100644
--- a/net/ipx/af_ipx.c
+++ b/net/ipx/af_ipx.c
@@ -983,10 +983,6 @@ static int ipxitf_create(struct ipx_interface_definition *idef)
                 goto out;
 
         switch (idef->ipx_dlink_type) {
-        case IPX_FRAME_TR_8022:
-                printk(KERN_WARNING "IPX frame type 802.2TR is "
-                        "obsolete Use 802.2 instead.\n");
-                /* fall through */
         case IPX_FRAME_8022:
                 dlink_type      = htons(ETH_P_802_2);
                 datalink        = p8022_datalink;
@@ -996,10 +992,7 @@ static int ipxitf_create(struct ipx_interface_definition *idef)
                         dlink_type      = htons(ETH_P_IPX);
                         datalink        = pEII_datalink;
                         break;
-                } else
-                        printk(KERN_WARNING "IPX frame type EtherII over "
-                                        "token-ring is obsolete. Use SNAP "
-                                        "instead.\n");
+                }
                 /* fall through */
         case IPX_FRAME_SNAP:
                 dlink_type      = htons(ETH_P_SNAP);
@@ -1275,7 +1268,6 @@ const char *ipx_frame_name(__be16 frame)
         case ETH_P_802_2:       rc = "802.2";   break;
         case ETH_P_SNAP:        rc = "SNAP";    break;
         case ETH_P_802_3:       rc = "802.3";   break;
-        case ETH_P_TR_802_2:    rc = "802.2TR"; break;
         }
 
         return rc;
diff --git a/net/llc/af_llc.c b/net/llc/af_llc.c
index 78424f41cf36..e9440753e16b 100644
--- a/net/llc/af_llc.c
+++ b/net/llc/af_llc.c
@@ -71,8 +71,7 @@ static inline u16 llc_ui_next_link_no(int sap)
  */
 static inline __be16 llc_proto_type(u16 arphrd)
 {
-        return arphrd == ARPHRD_IEEE802_TR ?
-                         htons(ETH_P_TR_802_2) : htons(ETH_P_802_2);
+        return htons(ETH_P_802_2);
 }
 
 /**
diff --git a/net/llc/llc_output.c b/net/llc/llc_output.c
index b658cba89fdd..2dae8a5df23f 100644
--- a/net/llc/llc_output.c
+++ b/net/llc/llc_output.c
@@ -14,9 +14,7 @@
  */
 
 #include <linux/if_arp.h>
-#include <linux/if_tr.h>
 #include <linux/netdevice.h>
-#include <linux/trdevice.h>
 #include <linux/skbuff.h>
 #include <linux/export.h>
 #include <net/llc.h>
@@ -37,7 +35,6 @@ int llc_mac_hdr_init(struct sk_buff *skb,
         int rc = -EINVAL;
 
         switch (skb->dev->type) {
-        case ARPHRD_IEEE802_TR:
         case ARPHRD_ETHER:
         case ARPHRD_LOOPBACK:
                 rc = dev_hard_header(skb, skb->dev, ETH_P_802_2, da, sa,
diff --git a/net/llc/llc_sap.c b/net/llc/llc_sap.c
index 94e7fca75b85..7c5073badc73 100644
--- a/net/llc/llc_sap.c
+++ b/net/llc/llc_sap.c
@@ -31,10 +31,6 @@ static int llc_mac_header_len(unsigned short devtype)
         case ARPHRD_ETHER:
         case ARPHRD_LOOPBACK:
                 return sizeof(struct ethhdr);
-#if defined(CONFIG_TR) || defined(CONFIG_TR_MODULE)
-        case ARPHRD_IEEE802_TR:
-                return sizeof(struct trh_hdr);
-#endif
         }
         return 0;
 }
diff --git a/net/sysctl_net.c b/net/sysctl_net.c
index f3e813a8d107..e3a6e37cd1c5 100644
--- a/net/sysctl_net.c
+++ b/net/sysctl_net.c
@@ -26,10 +26,6 @@
 #include <linux/if_ether.h>
 #endif
 
-#ifdef CONFIG_TR
-#include <linux/if_tr.h>
-#endif
-
 static struct ctl_table_set *
 net_ctl_header_lookup(struct ctl_table_root *root, struct nsproxy *namespaces)
 {