diff options
| author | David S. Miller <davem@davemloft.net> | 2012-05-16 01:02:40 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-05-16 01:02:40 -0400 |
| commit | c727e7f0071cae66c029f667d48b154c6b64227b (patch) | |
| tree | 197c2760fcae529d04d56f56e9cd55f51d6d9273 /net/ipv6/ndisc.c | |
| parent | 91df42bedccb919902c7cf7eb876c982ae7f1b1d (diff) | |
| parent | ee446fd5e6dafee4a16fd1bd345d2571dcfd6f5d (diff) | |
| download | op-kernel-dev-c727e7f0071cae66c029f667d48b154c6b64227b.zip op-kernel-dev-c727e7f0071cae66c029f667d48b154c6b64227b.tar.gz | |
Merge branch 'delete-tokenring' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux
Diffstat (limited to 'net/ipv6/ndisc.c')
| -rw-r--r-- | net/ipv6/ndisc.c | 17 |
1 files changed, 0 insertions, 17 deletions
diff --git a/net/ipv6/ndisc.c b/net/ipv6/ndisc.c index 511e5b4..cbb863d 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 |
