diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-07-29 01:24:00 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-07-29 01:24:00 -0400 |
| commit | d7446c0b5224e7024bd2f881b3d7fce0b9713fea (patch) | |
| tree | 57e5fbd69f81ac0ff1220efb876efaae3f723e8b | |
| parent | 7d2d8259a2a3078c629b6ee9d4a7ae3ef74ac100 (diff) | |
| parent | 187ff3b8575569668cde9021b9fe70386a4131fb (diff) | |
| download | kernel_samsung_smdk4412-d7446c0b5224e7024bd2f881b3d7fce0b9713fea.tar.gz kernel_samsung_smdk4412-d7446c0b5224e7024bd2f881b3d7fce0b9713fea.tar.bz2 kernel_samsung_smdk4412-d7446c0b5224e7024bd2f881b3d7fce0b9713fea.zip | |
Merge branch 'upstream-fixes' into upstream
| -rw-r--r-- | drivers/net/myri10ge/myri10ge.c | 2 | ||||
| -rw-r--r-- | drivers/net/skge.c | 5 |
2 files changed, 2 insertions, 5 deletions
diff --git a/drivers/net/myri10ge/myri10ge.c b/drivers/net/myri10ge/myri10ge.c index 07ca9480a6f..c3e52c806b1 100644 --- a/drivers/net/myri10ge/myri10ge.c +++ b/drivers/net/myri10ge/myri10ge.c @@ -620,7 +620,7 @@ static int myri10ge_load_firmware(struct myri10ge_priv *mgp) return -ENXIO; } dev_info(&mgp->pdev->dev, "handoff confirmed\n"); - myri10ge_dummy_rdma(mgp, mgp->tx.boundary != 4096); + myri10ge_dummy_rdma(mgp, 1); return 0; } diff --git a/drivers/net/skge.c b/drivers/net/skge.c index 82200bfaa8e..7de9a07b2ac 100644 --- a/drivers/net/skge.c +++ b/drivers/net/skge.c @@ -516,10 +516,7 @@ static int skge_set_pauseparam(struct net_device *dev, /* Chip internal frequency for clock calculations */ static inline u32 hwkhz(const struct skge_hw *hw) { - if (hw->chip_id == CHIP_ID_GENESIS) - return 53215; /* or: 53.125 MHz */ - else - return 78215; /* or: 78.125 MHz */ + return (hw->chip_id == CHIP_ID_GENESIS) ? 53125 : 78125; } /* Chip HZ to microseconds */ |