From 24ad3921203146a87891982be18ddac1170fe04f Mon Sep 17 00:00:00 2001 From: Benjamin Herrenschmidt Date: Mon, 18 Aug 2008 07:29:23 +1000 Subject: [PATCH] --- yaml --- r: 109271 b: refs/heads/master c: e8296582783a9f3bf75dbeb98dfdae15fd45c008 h: refs/heads/master i: 109269: 1099df303388f9da3c024b2adbbee7cb6e4facb6 109267: 676d0496f2015a2f65f9bb7d44b69c12ceaf5ccc 109263: 57534fac087c5eecebefe7c2e0fe2a8d6ef03077 v: v3 --- [refs] | 2 +- trunk/drivers/net/ibm_newemac/core.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 96f96441c074..59beda758b13 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ab9399059bb85a94758f42fb25607e440e926cc6 +refs/heads/master: e8296582783a9f3bf75dbeb98dfdae15fd45c008 diff --git a/trunk/drivers/net/ibm_newemac/core.c b/trunk/drivers/net/ibm_newemac/core.c index 2e720f26ca83..ccd9d9058f6d 100644 --- a/trunk/drivers/net/ibm_newemac/core.c +++ b/trunk/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);