qlge: Fix bug in MTU setting process.

Since an FCoE function shares a port with this NIC function, the
jumbo settings must always be in place.  This patch causes the
hardware to be set up for jumbo if it is not already done.

Signed-off-by: Ron Mercer <ron.mercer@qlogic.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/qlge/qlge_mpi.c b/drivers/net/qlge/qlge_mpi.c
index ff84243..de96b8a 100644 (file)
--- a/drivers/net/qlge/qlge_mpi.c
+++ b/drivers/net/qlge/qlge_mpi.c
@@ -761,7 +761,6 @@ void ql_mpi_port_cfg_work(struct work_struct *work)
 {
        struct ql_adapter *qdev =
            container_of(work, struct ql_adapter, mpi_port_cfg_work.work);
-       struct net_device *ndev = qdev->ndev;
        int status;
 
        status = ql_mb_get_port_cfg(qdev);
@@ -771,9 +770,7 @@ void ql_mpi_port_cfg_work(struct work_struct *work)
                goto err;
        }
 
-       if (ndev->mtu <= 2500)
-               goto end;
-       else if (qdev->link_config & CFG_JUMBO_FRAME_SIZE &&
+       if (qdev->link_config & CFG_JUMBO_FRAME_SIZE &&
                        qdev->max_frame_size ==
                        CFG_DEFAULT_MAX_FRAME_SIZE)
                goto end;