[PATCH 1/2] qlge: removing unreachable block of code

[PATCH 1/2] qlge: removing unreachable block of code

[leitao]

Currently the qlge_change_mtu() is never called if the new_mtu is
equal current MTU, due this condition on dev_set_mtu():

        if (new_mtu == dev->mtu)
                return 0;

So, this block of code is never reached and is being removed.

Signed-off-by: Breno Leitao <leitao@linux.vnet.ibm.com>
---
 drivers/net/qlge/qlge_main.c |    3 ---
 1 files changed, 0 insertions(+), 3 deletions(-)

diff --git a/drivers/net/qlge/qlge_main.c b/drivers/net/qlge/qlge_main.c
index 7e00029..c583fb5 100644
--- a/drivers/net/qlge/qlge_main.c
+++ b/drivers/net/qlge/qlge_main.c
@@ -4123,9 +4123,6 @@ static int qlge_change_mtu(struct net_device *ndev, int new_mtu)
 		QPRINTK(qdev, IFUP, ERR, "Changing to jumbo MTU.\n");
 	} else if (ndev->mtu == 9000 && new_mtu == 1500) {
 		QPRINTK(qdev, IFUP, ERR, "Changing to normal MTU.\n");
-	} else if ((ndev->mtu == 1500 && new_mtu == 1500) ||
-		   (ndev->mtu == 9000 && new_mtu == 9000)) {
-		return 0;
 	} else
 		return -EINVAL;
 
-- 
1.6.0.2

[PATCH 2/2] qlge: Code clean up

[leitao]

Just reordering this assignment that doesn't depend on any
condition.

Signed-off-by: Breno Leitao <leitao@linux.vnet.ibm.com>
---
 drivers/net/qlge/qlge_main.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/net/qlge/qlge_main.c b/drivers/net/qlge/qlge_main.c
index c583fb5..0d6e6f8 100644
--- a/drivers/net/qlge/qlge_main.c
+++ b/drivers/net/qlge/qlge_main.c
@@ -4129,12 +4129,12 @@ static int qlge_change_mtu(struct net_device *ndev, int new_mtu)
 	queue_delayed_work(qdev->workqueue,
 			&qdev->mpi_port_cfg_work, 3*HZ);
 
+	ndev->mtu = new_mtu;
+
 	if (!netif_running(qdev->ndev)) {
-		ndev->mtu = new_mtu;
 		return 0;
 	}
 
-	ndev->mtu = new_mtu;
 	status = ql_change_rx_buffers(qdev);
 	if (status) {
 		QPRINTK(qdev, IFUP, ERR,
-- 
1.6.0.2

Re: [PATCH 1/2] qlge: removing unreachable block of code

[Ron Mercer]

On Thu, Feb 04, 2010 at 12:11:18PM -0800, leitao@linux.vnet.ibm.com wrote:
> Currently the qlge_change_mtu() is never called if the new_mtu is
> equal current MTU, due this condition on dev_set_mtu():

Both look good.  Thanks


Signed-off-by: Ron Mercer <ron.mercer@qlogic.com>

Re: [PATCH 1/2] qlge: removing unreachable block of code

[David Miller]

From: Ron Mercer <ron.mercer@qlogic.com>
Date: Thu, 4 Feb 2010 15:11:30 -0800

> On Thu, Feb 04, 2010 at 12:11:18PM -0800, leitao@linux.vnet.ibm.com wrote:
>> Currently the qlge_change_mtu() is never called if the new_mtu is
>> equal current MTU, due this condition on dev_set_mtu():
> 
> Both look good.  Thanks
> 
> 
> Signed-off-by: Ron Mercer <ron.mercer@qlogic.com>

Both patches applied, thanks everyone.