aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/qlge
diff options
context:
space:
mode:
authorRon Mercer <ron.mercer@qlogic.com>2009-06-07 09:58:27 -0400
committerDavid S. Miller <davem@davemloft.net>2009-06-08 03:09:47 -0400
commitc8269b21ddfd0181881aca959cff64ff15a0b7d3 (patch)
tree328d093a367335d372b7c385c1e0e7ad11623fb5 /drivers/net/qlge
parent709ac4f43d76135daa9c2e33ab90eadd16bfce15 (diff)
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>
Diffstat (limited to 'drivers/net/qlge')
-rw-r--r--drivers/net/qlge/qlge_mpi.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/net/qlge/qlge_mpi.c b/drivers/net/qlge/qlge_mpi.c
index ff8424330a9c..de96b8a7c373 100644
--- 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)
761{ 761{
762 struct ql_adapter *qdev = 762 struct ql_adapter *qdev =
763 container_of(work, struct ql_adapter, mpi_port_cfg_work.work); 763 container_of(work, struct ql_adapter, mpi_port_cfg_work.work);
764 struct net_device *ndev = qdev->ndev;
765 int status; 764 int status;
766 765
767 status = ql_mb_get_port_cfg(qdev); 766 status = ql_mb_get_port_cfg(qdev);
@@ -771,9 +770,7 @@ void ql_mpi_port_cfg_work(struct work_struct *work)
771 goto err; 770 goto err;
772 } 771 }
773 772
774 if (ndev->mtu <= 2500) 773 if (qdev->link_config & CFG_JUMBO_FRAME_SIZE &&
775 goto end;
776 else if (qdev->link_config & CFG_JUMBO_FRAME_SIZE &&
777 qdev->max_frame_size == 774 qdev->max_frame_size ==
778 CFG_DEFAULT_MAX_FRAME_SIZE) 775 CFG_DEFAULT_MAX_FRAME_SIZE)
779 goto end; 776 goto end;