tokenring: delete all remaining driver support

This represents the mass deletion of the of the tokenring support.

It gets rid of:
  - the net/tr.c which the drivers depended on
  - the drivers/net component
  - the Kbuild infrastructure around it
  - any tokenring related CONFIG_ settings in any defconfigs
  - the tokenring headers in the include/linux dir
  - the firmware associated with the tokenring drivers.
  - any associated token ring documentation.

Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>

2 files changed, 0 insertions, 670 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/tr.c b/net/802/tr.c
deleted file mode 100644
index 175243b0d6d8..000000000000
--- a/net/802/tr.c
+++ /dev/null
@@ -1,669 +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;