From b4f2fc440e2cc096e02a871cc5340d313e07db82 Mon Sep 17 00:00:00 2001 From: Denis Kirjanov Date: Fri, 3 Sep 2010 10:05:39 +0000 Subject: [PATCH] --- yaml --- r: 214299 b: refs/heads/master c: 7457e911c72eb0041b007943b0a29aab5a1c4a39 h: refs/heads/master i: 214297: 325a772e7c2effc61726baff1bbc944719bb7a93 214295: 250f20e92048361cd03b1cabc9055075120f32e0 v: v3 --- [refs] | 2 +- trunk/drivers/net/ns83820.c | 11 +---------- 2 files changed, 2 insertions(+), 11 deletions(-) diff --git a/[refs] b/[refs] index bd4fec63c07f..78ba665e5b59 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d1fb62796cdac6899ebd4319e4a610684db063e9 +refs/heads/master: 7457e911c72eb0041b007943b0a29aab5a1c4a39 diff --git a/trunk/drivers/net/ns83820.c b/trunk/drivers/net/ns83820.c index 4475ca97f031..b3cebb1204f1 100644 --- a/trunk/drivers/net/ns83820.c +++ b/trunk/drivers/net/ns83820.c @@ -1246,7 +1246,6 @@ static int ns83820_get_settings(struct net_device *ndev, { struct ns83820 *dev = PRIV(ndev); u32 cfg, tanar, tbicr; - int have_optical = 0; int fullduplex = 0; /* @@ -1267,15 +1266,7 @@ static int ns83820_get_settings(struct net_device *ndev, tanar = readl(dev->base + TANAR); tbicr = readl(dev->base + TBICR); - if (dev->CFG_cache & CFG_TBI_EN) { - /* we have an optical interface */ - have_optical = 1; - fullduplex = (cfg & CFG_DUPSTS) ? 1 : 0; - - } else { - /* We have copper */ - fullduplex = (cfg & CFG_DUPSTS) ? 1 : 0; - } + fullduplex = (cfg & CFG_DUPSTS) ? 1 : 0; cmd->supported = SUPPORTED_Autoneg;