aboutsummaryrefslogtreecommitdiffstats
path: root/net/ipv6/addrconf.c
diff options
context:
space:
mode:
authorPaul Gortmaker <paul.gortmaker@windriver.com>2012-05-10 17:14:35 -0400
committerPaul Gortmaker <paul.gortmaker@windriver.com>2012-05-15 20:14:35 -0400
commit211ed865108e24697b44bee5daac502ee6bdd4a4 (patch)
tree2a902c914f96298f265ef52cba5e463c5c8dea32 /net/ipv6/addrconf.c
parent60eea6cf2964beea6c38d9050bc3823a93db97e0 (diff)
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>
Diffstat (limited to 'net/ipv6/addrconf.c')
-rw-r--r--net/ipv6/addrconf.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c
index 4d1d51a0bd26..f6b5b8ac3cf2 100644
--- a/net/ipv6/addrconf.c
+++ b/net/ipv6/addrconf.c
@@ -1575,7 +1575,6 @@ static int ipv6_generate_eui64(u8 *eui, struct net_device *dev)
1575 switch (dev->type) { 1575 switch (dev->type) {
1576 case ARPHRD_ETHER: 1576 case ARPHRD_ETHER:
1577 case ARPHRD_FDDI: 1577 case ARPHRD_FDDI:
1578 case ARPHRD_IEEE802_TR:
1579 return addrconf_ifid_eui48(eui, dev); 1578 return addrconf_ifid_eui48(eui, dev);
1580 case ARPHRD_ARCNET: 1579 case ARPHRD_ARCNET:
1581 return addrconf_ifid_arcnet(eui, dev); 1580 return addrconf_ifid_arcnet(eui, dev);
@@ -2444,7 +2443,6 @@ static void addrconf_dev_config(struct net_device *dev)
2444 2443
2445 if ((dev->type != ARPHRD_ETHER) && 2444 if ((dev->type != ARPHRD_ETHER) &&
2446 (dev->type != ARPHRD_FDDI) && 2445 (dev->type != ARPHRD_FDDI) &&
2447 (dev->type != ARPHRD_IEEE802_TR) &&
2448 (dev->type != ARPHRD_ARCNET) && 2446 (dev->type != ARPHRD_ARCNET) &&
2449 (dev->type != ARPHRD_INFINIBAND) && 2447 (dev->type != ARPHRD_INFINIBAND) &&
2450 (dev->type != ARPHRD_IEEE802154)) { 2448 (dev->type != ARPHRD_IEEE802154)) {