From c584d2287088122ddd5fecf914ddca69b1d0ee07 Mon Sep 17 00:00:00 2001
From: Ron Mercer <ron.mercer@qlogic.com>
Date: Sun, 7 Jun 2009 13:58:27 +0000
Subject: [PATCH] --- yaml --- r: 150727 b: refs/heads/master c:
 c8269b21ddfd0181881aca959cff64ff15a0b7d3 h: refs/heads/master i:   150725:
 204d9e2d46e92b3185ee383fc5a3a48961fee560   150723:
 d252279be1436c2716c44440b4bb80273b2e8f4d   150719:
 f39150ce781a31170e38ffbcbf68c4d5acebee4b v: v3

---
 [refs]                            | 2 +-
 trunk/drivers/net/qlge/qlge_mpi.c | 5 +----
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 325644c72c83..403049b3db8c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 709ac4f43d76135daa9c2e33ab90eadd16bfce15
+refs/heads/master: c8269b21ddfd0181881aca959cff64ff15a0b7d3
diff --git a/trunk/drivers/net/qlge/qlge_mpi.c b/trunk/drivers/net/qlge/qlge_mpi.c
index ff8424330a9c..de96b8a7c373 100644
--- a/trunk/drivers/net/qlge/qlge_mpi.c
+++ b/trunk/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;