Commit c8269b21 authored by Ron Mercer's avatar Ron Mercer Committed by David S. Miller

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: default avatarRon Mercer <ron.mercer@qlogic.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 709ac4f4
...@@ -761,7 +761,6 @@ void ql_mpi_port_cfg_work(struct work_struct *work) ...@@ -761,7 +761,6 @@ void ql_mpi_port_cfg_work(struct work_struct *work)
{ {
struct ql_adapter *qdev = struct ql_adapter *qdev =
container_of(work, struct ql_adapter, mpi_port_cfg_work.work); container_of(work, struct ql_adapter, mpi_port_cfg_work.work);
struct net_device *ndev = qdev->ndev;
int status; int status;
status = ql_mb_get_port_cfg(qdev); status = ql_mb_get_port_cfg(qdev);
...@@ -771,9 +770,7 @@ void ql_mpi_port_cfg_work(struct work_struct *work) ...@@ -771,9 +770,7 @@ void ql_mpi_port_cfg_work(struct work_struct *work)
goto err; goto err;
} }
if (ndev->mtu <= 2500) if (qdev->link_config & CFG_JUMBO_FRAME_SIZE &&
goto end;
else if (qdev->link_config & CFG_JUMBO_FRAME_SIZE &&
qdev->max_frame_size == qdev->max_frame_size ==
CFG_DEFAULT_MAX_FRAME_SIZE) CFG_DEFAULT_MAX_FRAME_SIZE)
goto end; goto end;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment