3 files changed, 0 insertions, 78 deletions

diff --git a/include/net/if_inet6.h b/include/net/if_inet6.h
index 50f325fd069..93563221d29 100644
--- a/include/net/if_inet6.h
+++ b/include/net/if_inet6.h
@@ -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;
diff --git a/include/net/ip.h b/include/net/ip.h
index 94ddb69cc0f..83e0619f59d 100644
--- a/include/net/ip.h
+++ b/include/net/ip.h
@@ -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;
diff --git a/include/net/llc_pdu.h b/include/net/llc_pdu.h
index f57e7d46a45..5a93d13ac95 100644
--- a/include/net/llc_pdu.h
+++ b/include/net/llc_pdu.h
@@ -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);
 }
 
 /**