Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 150727
b: refs/heads/master
c: c8269b2
h: refs/heads/master
i:
  150725: 204d9e2
  150723: d252279
  150719: f39150c
v: v3
  • Loading branch information
Ron Mercer authored and David S. Miller committed Jun 8, 2009
1 parent 133fa10 commit c584d22
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 5 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 709ac4f43d76135daa9c2e33ab90eadd16bfce15
refs/heads/master: c8269b21ddfd0181881aca959cff64ff15a0b7d3
5 changes: 1 addition & 4 deletions trunk/drivers/net/qlge/qlge_mpi.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand All @@ -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;
Expand Down

0 comments on commit c584d22

Please sign in to comment.