diff options
| author | Simon Horman <horms@verge.net.au> | 2008-08-27 22:47:46 +1000 |
|---|---|---|
| committer | Simon Horman <horms@verge.net.au> | 2008-08-27 22:47:46 +1000 |
| commit | b18e30412dde08536c9df6eae3f571fddb560e7f (patch) | |
| tree | 1ca4e3ea848d3035311f29a6f03cb884e82e6639 /drivers/net/ibm_newemac/core.c | |
| parent | 09bf825e8e3049db1d72d464d0a6b857cc037a43 (diff) | |
| parent | f2455eb176ac87081bbfc9a44b21c7cd2bc1967e (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'drivers/net/ibm_newemac/core.c')
| -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 2e720f26ca8..ccd9d9058f6 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); |