Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 109271
b: refs/heads/master
c: e829658
h: refs/heads/master
i:
  109269: 1099df3
  109267: 676d049
  109263: 57534fa
v: v3
  • Loading branch information
Benjamin Herrenschmidt authored and Jeff Garzik committed Aug 27, 2008
1 parent 1f5b3aa commit 24ad392
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: ab9399059bb85a94758f42fb25607e440e926cc6
refs/heads/master: e8296582783a9f3bf75dbeb98dfdae15fd45c008
6 changes: 3 additions & 3 deletions trunk/drivers/net/ibm_newemac/core.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

Expand Down Expand Up @@ -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);
Expand Down

0 comments on commit 24ad392

Please sign in to comment.