net: delete all instances of special processing for token ring
authorPaul Gortmaker <paul.gortmaker@windriver.com>
Thu, 10 May 2012 21:14:35 +0000 (17:14 -0400)
committerPaul Gortmaker <paul.gortmaker@windriver.com>
Wed, 16 May 2012 00:14:35 +0000 (20:14 -0400)
We are going to delete the Token ring support.  This removes any
special processing in the core networking for token ring, (aside
from net/tr.c itself), leaving the drivers and remaining tokenring
support present but inert.

The mass removal of the drivers and net/tr.c will be in a separate
commit, so that the history of these files that we still care
about won't have the giant deletion tied into their history.

Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
18 files changed:
include/linux/if_arp.h
include/linux/ipx.h
include/net/if_inet6.h
include/net/ip.h
include/net/llc_pdu.h
net/802/p8022.c
net/802/tr.c
net/core/dev.c
net/ipv4/Kconfig
net/ipv4/arp.c
net/ipv4/ipconfig.c
net/ipv6/addrconf.c
net/ipv6/ndisc.c
net/ipx/af_ipx.c
net/llc/af_llc.c
net/llc/llc_output.c
net/llc/llc_sap.c
net/sysctl_net.c

index 6d722f41ee7c760010ae26f3deea4fea1c9ca4aa..3718acf40a09ba9aba3026524a3c099841a548f7 100644 (file)
@@ -82,7 +82,7 @@
 #define ARPHRD_FCPL    786             /* Fibrechannel public loop     */
 #define ARPHRD_FCFABRIC        787             /* Fibrechannel fabric          */
        /* 787->799 reserved for fibrechannel media types */
-#define ARPHRD_IEEE802_TR 800          /* Magic type ident for TR      */
+/* 800 used to be used for token ring */
 #define ARPHRD_IEEE80211 801           /* IEEE 802.11                  */
 #define ARPHRD_IEEE80211_PRISM 802     /* IEEE 802.11 + Prism2 header  */
 #define ARPHRD_IEEE80211_RADIOTAP 803  /* IEEE 802.11 + radiotap header */
index 3d48014cdd71d0d120693594e50a4b1cbc3155cc..8f0243982eb6a5b7212f5f8a8a9bed3bd8d9dbb5 100644 (file)
@@ -38,7 +38,7 @@ struct ipx_interface_definition {
 #define IPX_FRAME_8022         2
 #define IPX_FRAME_ETHERII      3
 #define IPX_FRAME_8023         4
-#define IPX_FRAME_TR_8022       5 /* obsolete */
+/* obsolete token ring was     5 */
        unsigned char ipx_special;
 #define IPX_SPECIAL_NONE       0
 #define IPX_PRIMARY            1
index 50f325fd06919958a19bae2c1a07e85c63703341..93563221d29a728e9a8afef579d90f3a3b8587aa 100644 (file)
@@ -209,60 +209,6 @@ static inline void ipv6_eth_mc_map(const struct in6_addr *addr, char *buf)
        memcpy(buf + 2, &addr->s6_addr32[3], sizeof(__u32));
 }
 
-static inline void ipv6_tr_mc_map(const struct in6_addr *addr, char *buf)
-{
-       /* All nodes FF01::1, FF02::1, FF02::1:FFxx:xxxx */
-
-       if (((addr->s6_addr[0] == 0xFF) &&
-           ((addr->s6_addr[1] == 0x01) || (addr->s6_addr[1] == 0x02)) &&
-            (addr->s6_addr16[1] == 0) &&
-            (addr->s6_addr32[1] == 0) &&
-            (addr->s6_addr32[2] == 0) &&
-            (addr->s6_addr16[6] == 0) &&
-            (addr->s6_addr[15] == 1)) ||
-           ((addr->s6_addr[0] == 0xFF) &&
-            (addr->s6_addr[1] == 0x02) &&
-            (addr->s6_addr16[1] == 0) &&
-            (addr->s6_addr32[1] == 0) &&
-            (addr->s6_addr16[4] == 0) &&
-            (addr->s6_addr[10] == 0) &&
-            (addr->s6_addr[11] == 1) &&
-            (addr->s6_addr[12] == 0xff)))
-       {
-               buf[0]=0xC0;
-               buf[1]=0x00;
-               buf[2]=0x01;
-               buf[3]=0x00;
-               buf[4]=0x00;
-               buf[5]=0x00;
-       /* All routers FF0x::2 */
-       } else if ((addr->s6_addr[0] ==0xff) &&
-               ((addr->s6_addr[1] & 0xF0) == 0) &&
-               (addr->s6_addr16[1] == 0) &&
-               (addr->s6_addr32[1] == 0) &&
-               (addr->s6_addr32[2] == 0) &&
-               (addr->s6_addr16[6] == 0) &&
-               (addr->s6_addr[15] == 2))
-       {
-               buf[0]=0xC0;
-               buf[1]=0x00;
-               buf[2]=0x02;
-               buf[3]=0x00;
-               buf[4]=0x00;
-               buf[5]=0x00;
-       } else {
-               unsigned char i ; 
-               
-               i = addr->s6_addr[15] & 7 ; 
-               buf[0]=0xC0;
-               buf[1]=0x00;
-               buf[2]=0x00;
-               buf[3]=0x01 << i ; 
-               buf[4]=0x00;
-               buf[5]=0x00;
-       }
-}
-
 static inline void ipv6_arcnet_mc_map(const struct in6_addr *addr, char *buf)
 {
        buf[0] = 0x00;
index 94ddb69cc0f3c816bf66d52c155650a41a3481bf..83e0619f59d03d5e087c03fba83c0b402ea13502 100644 (file)
@@ -141,23 +141,6 @@ static inline struct sk_buff *ip_finish_skb(struct sock *sk, struct flowi4 *fl4)
 extern int             ip4_datagram_connect(struct sock *sk, 
                                             struct sockaddr *uaddr, int addr_len);
 
-/*
- *     Map a multicast IP onto multicast MAC for type Token Ring.
- *      This conforms to RFC1469 Option 2 Multicasting i.e.
- *      using a functional address to transmit / receive 
- *      multicast packets.
- */
-
-static inline void ip_tr_mc_map(__be32 addr, char *buf)
-{
-       buf[0]=0xC0;
-       buf[1]=0x00;
-       buf[2]=0x00;
-       buf[3]=0x04;
-       buf[4]=0x00;
-       buf[5]=0x00;
-}
-
 struct ip_reply_arg {
        struct kvec iov[1];   
        int         flags;
index f57e7d46a453db3fc52bc53cbb9dfc6cbdf26119..5a93d13ac95c8177542a3f2b327ae60b26065cea 100644 (file)
@@ -13,7 +13,6 @@
  */
 
 #include <linux/if_ether.h>
-#include <linux/if_tr.h>
 
 /* Lengths of frame formats */
 #define LLC_PDU_LEN_I  4       /* header and 2 control bytes */
@@ -253,10 +252,6 @@ static inline void llc_pdu_decode_sa(struct sk_buff *skb, u8 *sa)
 {
        if (skb->protocol == htons(ETH_P_802_2))
                memcpy(sa, eth_hdr(skb)->h_source, ETH_ALEN);
-       else if (skb->protocol == htons(ETH_P_TR_802_2)) {
-               memcpy(sa, tr_hdr(skb)->saddr, ETH_ALEN);
-               *sa &= 0x7F;
-       }
 }
 
 /**
@@ -270,8 +265,6 @@ static inline void llc_pdu_decode_da(struct sk_buff *skb, u8 *da)
 {
        if (skb->protocol == htons(ETH_P_802_2))
                memcpy(da, eth_hdr(skb)->h_dest, ETH_ALEN);
-       else if (skb->protocol == htons(ETH_P_TR_802_2))
-               memcpy(da, tr_hdr(skb)->daddr, ETH_ALEN);
 }
 
 /**
index 7f353c4f437ac1bcf0f3ec3646a134fc6e425038..0bda8de7df512e9ee8b4f53fc6f6624111671374 100644 (file)
@@ -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
index 30a352ed09b1bfc9ecd95d26ccfa5f28db8b9d47..175243b0d6d85fca7e345c147fd7ef4560955ed3 100644 (file)
@@ -604,7 +604,6 @@ static void tr_setup(struct net_device *dev)
 
        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;
index 3dd853998d38af2f9f6191f0ecbd875a472c8786..66cae6e975d98af4fc512be45825e8c0260dc9bd 100644 (file)
@@ -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)];
index 2c8febd3ebdac7c14018d45b0318900adda8fd8b..20f1cb5c8aba6b7eb2efeb3c579e998a5eac6419 100644 (file)
@@ -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.
 
index 373b56bf8f49fea60a0347b969efe366f64bdcd9..5097571cc4b04c5b24783eaf096fc65082aa7c99 100644 (file)
@@ -89,7 +89,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>
@@ -193,9 +192,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;
@@ -647,12 +643,6 @@ struct sk_buff *arp_create(int type, int ptype, __be32 dest_ip,
                arp->ar_hrd = htons(ARPHRD_ETHER);
                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
        }
 
@@ -751,11 +741,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
index 24a3df9890e151b798b784648a0090861becb6d9..430015010e5740854ed3384cc8cc303f311e6922 100644 (file)
@@ -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 {
index 4d1d51a0bd26c8938734c058294ae1295aa64dad..f6b5b8ac3cf2a0835cb00a3a8b7ec755dfb1749c 100644 (file)
@@ -1575,7 +1575,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);
@@ -2444,7 +2443,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)) {
index 35615c6358b88aebd50742cab6ed489cf6db9c5d..56963f15bdc5f2a60fb76dec230942e7ee61fc50 100644 (file)
@@ -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
index 9680226640ef783c164618f2f2f8fd5504259f4a..824d4a3338ae89645528605f8de69e42cdc178a8 100644 (file)
@@ -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;
index 78424f41cf367494147abb3fd8970b460c59bf56..e9440753e16b913b0597427a5e912e48965b6c96 100644 (file)
@@ -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);
 }
 
 /**
index b658cba89fdd6fe97ded4b79d7fd9ae30459182d..2dae8a5df23fe56f93620dcaf313a54d6e41b231 100644 (file)
@@ -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,
index 94e7fca75b851762623a5e536abfc233810f8920..7c5073badc7349ac6e8f74af69902526fb66bda5 100644 (file)
@@ -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;
 }
index f3e813a8d107765f2040f6328787c920a6f69516..e3a6e37cd1c536cc93d5caa850219e4104bb646b 100644 (file)
 #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)
 {