net: delete all instances of special processing for token ring

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>

1 files changed, 0 insertions, 17 deletions

diff --git a/net/ipv6/ndisc.c b/net/ipv6/ndisc.c
index 35615c6358b8..56963f15bdc5 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