diff options
| author | Olof Johansson <olof@lixom.net> | 2008-03-25 15:58:40 +0100 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2008-04-07 16:16:24 +0200 |
| commit | 1724ac2ef1caf5b4f764d4b86a85d552a7d7c8fb (patch) | |
| tree | be14970df3d1ee5fd96b999d7cb383862856be13 | |
| parent | [POWERPC] Remove CONFIG_PCI_LEGACY from some configs (diff) | |
| download | linux-1724ac2ef1caf5b4f764d4b86a85d552a7d7c8fb.tar.xz linux-1724ac2ef1caf5b4f764d4b86a85d552a7d7c8fb.zip | |
pasemi_mac: Jumbo frame bugfixes
Fix a couple of corner cases around interface up/down when jumbo frames are
configured. Resources weren't always freed and reallocated properly.
Signed-off-by: Olof Johansson <olof@lixom.net>
Acked-by: Jeff Garzik <jgarzik@pobox.com>
| -rw-r--r-- | drivers/net/pasemi_mac.c | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/drivers/net/pasemi_mac.c b/drivers/net/pasemi_mac.c index c50f0f4de6d8..abb1dc4592f7 100644 --- a/drivers/net/pasemi_mac.c +++ b/drivers/net/pasemi_mac.c @@ -404,6 +404,7 @@ static void pasemi_mac_free_csring(struct pasemi_mac_csring *csring) pasemi_dma_free_flag(csring->events[1]); pasemi_dma_free_ring(&csring->chan); pasemi_dma_free_chan(&csring->chan); + pasemi_dma_free_fun(csring->fun); } static int pasemi_mac_setup_rx_resources(const struct net_device *dev) @@ -1150,7 +1151,10 @@ static int pasemi_mac_open(struct net_device *dev) if (!mac->tx) goto out_tx_ring; - if (dev->mtu > 1500) { + /* We might already have allocated rings in case mtu was changed + * before interface was brought up. + */ + if (dev->mtu > 1500 && !mac->num_cs) { pasemi_mac_setup_csrings(mac); if (!mac->num_cs) goto out_tx_ring; @@ -1388,8 +1392,12 @@ static int pasemi_mac_close(struct net_device *dev) free_irq(mac->tx->chan.irq, mac->tx); free_irq(mac->rx->chan.irq, mac->rx); - for (i = 0; i < mac->num_cs; i++) + for (i = 0; i < mac->num_cs; i++) { pasemi_mac_free_csring(mac->cs[i]); + mac->cs[i] = NULL; + } + + mac->num_cs = 0; /* Free resources */ pasemi_mac_free_rx_resources(mac); |