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/ipv4/ipconfig.c | |
parent | 60eea6cf2964beea6c38d9050bc3823a93db97e0 (diff) | |
download | op-kernel-dev-211ed865108e24697b44bee5daac502ee6bdd4a4.zip op-kernel-dev-211ed865108e24697b44bee5daac502ee6bdd4a4.tar.gz |
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/ipv4/ipconfig.c')
-rw-r--r-- | net/ipv4/ipconfig.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/net/ipv4/ipconfig.c b/net/ipv4/ipconfig.c index 24a3df9..4300150 100644 --- a/net/ipv4/ipconfig.c +++ b/net/ipv4/ipconfig.c @@ -808,8 +808,6 @@ static void __init ic_bootp_send_if(struct ic_device *d, unsigned long jiffies_d b->op = BOOTP_REQUEST; if (dev->type < 256) /* check for false types */ b->htype = dev->type; - else if (dev->type == ARPHRD_IEEE802_TR) /* fix for token ring */ - b->htype = ARPHRD_IEEE802; else if (dev->type == ARPHRD_FDDI) b->htype = ARPHRD_ETHER; else { |