diff options
Diffstat (limited to 'drivers/net/skge.c')
-rw-r--r-- | drivers/net/skge.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/net/skge.c b/drivers/net/skge.c index 82200bfaa8ed..ad878dfddef4 100644 --- a/drivers/net/skge.c +++ b/drivers/net/skge.c | |||
@@ -516,10 +516,7 @@ static int skge_set_pauseparam(struct net_device *dev, | |||
516 | /* Chip internal frequency for clock calculations */ | 516 | /* Chip internal frequency for clock calculations */ |
517 | static inline u32 hwkhz(const struct skge_hw *hw) | 517 | static inline u32 hwkhz(const struct skge_hw *hw) |
518 | { | 518 | { |
519 | if (hw->chip_id == CHIP_ID_GENESIS) | 519 | return (hw->chip_id == CHIP_ID_GENESIS) ? 53125 : 78125; |
520 | return 53215; /* or: 53.125 MHz */ | ||
521 | else | ||
522 | return 78215; /* or: 78.125 MHz */ | ||
523 | } | 520 | } |
524 | 521 | ||
525 | /* Chip HZ to microseconds */ | 522 | /* Chip HZ to microseconds */ |
@@ -2214,6 +2211,7 @@ static int skge_up(struct net_device *dev) | |||
2214 | skge_write8(hw, Q_ADDR(rxqaddr[port], Q_CSR), CSR_START | CSR_IRQ_CL_F); | 2211 | skge_write8(hw, Q_ADDR(rxqaddr[port], Q_CSR), CSR_START | CSR_IRQ_CL_F); |
2215 | skge_led(skge, LED_MODE_ON); | 2212 | skge_led(skge, LED_MODE_ON); |
2216 | 2213 | ||
2214 | netif_poll_enable(dev); | ||
2217 | return 0; | 2215 | return 0; |
2218 | 2216 | ||
2219 | free_rx_ring: | 2217 | free_rx_ring: |
@@ -2282,6 +2280,7 @@ static int skge_down(struct net_device *dev) | |||
2282 | 2280 | ||
2283 | skge_led(skge, LED_MODE_OFF); | 2281 | skge_led(skge, LED_MODE_OFF); |
2284 | 2282 | ||
2283 | netif_poll_disable(dev); | ||
2285 | skge_tx_clean(skge); | 2284 | skge_tx_clean(skge); |
2286 | skge_rx_clean(skge); | 2285 | skge_rx_clean(skge); |
2287 | 2286 | ||