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

3 files changed, 3 insertions, 16 deletions

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 {