diff options
| author | David S. Miller <davem@davemloft.net> | 2012-05-16 09:02:40 +0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-05-16 09:02:40 +0400 |
| commit | c727e7f0071cae66c029f667d48b154c6b64227b (patch) | |
| tree | 197c2760fcae529d04d56f56e9cd55f51d6d9273 /net/ipv6/addrconf.c | |
| parent | 91df42bedccb919902c7cf7eb876c982ae7f1b1d (diff) | |
| parent | ee446fd5e6dafee4a16fd1bd345d2571dcfd6f5d (diff) | |
| download | linux-c727e7f0071cae66c029f667d48b154c6b64227b.tar.xz | |
Merge branch 'delete-tokenring' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux
Diffstat (limited to 'net/ipv6/addrconf.c')
| -rw-r--r-- | net/ipv6/addrconf.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c index 8ec009c0b2bc..8f6411c97189 100644 --- a/net/ipv6/addrconf.c +++ b/net/ipv6/addrconf.c @@ -1573,7 +1573,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); @@ -2441,7 +2440,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)) { |