diff options
| author | Paul Gortmaker <paul.gortmaker@windriver.com> | 2012-05-10 17:14:35 -0400 |
|---|---|---|
| committer | Paul Gortmaker <paul.gortmaker@windriver.com> | 2012-05-15 20:14:35 -0400 |
| commit | 211ed865108e24697b44bee5daac502ee6bdd4a4 (patch) | |
| tree | 2a902c914f96298f265ef52cba5e463c5c8dea32 /net/802 | |
| parent | 60eea6cf2964beea6c38d9050bc3823a93db97e0 (diff) | |
| download | kernel-common-211ed865108e24697b44bee5daac502ee6bdd4a4.tar.gz kernel-common-211ed865108e24697b44bee5daac502ee6bdd4a4.tar.bz2 kernel-common-211ed865108e24697b44bee5daac502ee6bdd4a4.zip | |
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/802')
| -rw-r--r-- | net/802/p8022.c | 3 | ||||
| -rw-r--r-- | net/802/tr.c | 1 |
2 files changed, 1 insertions, 3 deletions
diff --git a/net/802/p8022.c b/net/802/p8022.c index 7f353c4f437a..0bda8de7df51 100644 --- a/net/802/p8022.c +++ b/net/802/p8022.c @@ -1,6 +1,5 @@ /* - * NET3: Support for 802.2 demultiplexing off Ethernet (Token ring - * is kept separate see p8022tr.c) + * NET3: Support for 802.2 demultiplexing off Ethernet * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version diff --git a/net/802/tr.c b/net/802/tr.c index 30a352ed09b1..175243b0d6d8 100644 --- a/net/802/tr.c +++ b/net/802/tr.c @@ -604,7 +604,6 @@ static void tr_setup(struct net_device *dev) dev->header_ops = &tr_header_ops; - dev->type = ARPHRD_IEEE802_TR; dev->hard_header_len = TR_HLEN; dev->mtu = 2000; dev->addr_len = TR_ALEN; |