diff options
| author |   Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2008-08-18 07:29:23 +1000 |
|---|---|---|
| committer |   Jeff Garzik <jgarzik@redhat.com> | 2008-08-27 05:55:24 -0400 |
| commit | e8296582783a9f3bf75dbeb98dfdae15fd45c008 (patch) | |
| tree | 78cc81d865c64158c50f52f09793de85a8e5addc /drivers | |
| parent | net: don't grab a mutex within a timer context in gianfar (diff) | |
| download | linux-dev-e8296582783a9f3bf75dbeb98dfdae15fd45c008.tar.xz linux-dev-e8296582783a9f3bf75dbeb98dfdae15fd45c008.zip | |
ibm_newemac: Don't call dev_mc_add() before device is registered
We must not call dev_mc_add() from within our HW configure which happens
before we initialize and register the netdev. Do it in open() instead.
Thanks to Sebastian Siewior for tracking it down.
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/net/ibm_newemac/core.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/ibm_newemac/core.c b/drivers/net/ibm_newemac/core.c index 2e720f26ca83..ccd9d9058f6d 100644 --- a/drivers/net/ibm_newemac/core.c +++ b/drivers/net/ibm_newemac/core.c @@ -663,9 +663,6 @@ static int emac_configure(struct emac_instance *dev) if (emac_phy_gpcs(dev->phy.mode)) emac_mii_reset_phy(&dev->phy); - /* Required for Pause packet support in EMAC */ - dev_mc_add(ndev, default_mcast_addr, sizeof(default_mcast_addr), 1); - return 0; } @@ -1150,6 +1147,9 @@ static int emac_open(struct net_device *ndev) } else netif_carrier_on(dev->ndev); + /* Required for Pause packet support in EMAC */ + dev_mc_add(ndev, default_mcast_addr, sizeof(default_mcast_addr), 1); + emac_configure(dev); mal_poll_add(dev->mal, &dev->commac); mal_enable_tx_channel(dev->mal, dev->mal_tx_chan); |