Merge branch 'linux-2.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);