Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 298773
b: refs/heads/master
c: 03f2eec
h: refs/heads/master
i:
  298771: 0665c0b
v: v3
  • Loading branch information
Marc Kleine-Budde authored and David S. Miller committed Apr 4, 2012
1 parent 82b9540 commit 79c0786
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 3 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: ca7b91bbd1f150216e6354cc20818aa993f331f2
refs/heads/master: 03f2eecdfc8aadae395ac593c099006390c8085c
6 changes: 4 additions & 2 deletions trunk/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
Original file line number Diff line number Diff line change
Expand Up @@ -1737,10 +1737,12 @@ static int stmmac_hw_init(struct stmmac_priv *priv)
struct mac_device_info *mac;

/* Identify the MAC HW device */
if (priv->plat->has_gmac)
if (priv->plat->has_gmac) {
priv->dev->priv_flags |= IFF_UNICAST_FLT;
mac = dwmac1000_setup(priv->ioaddr);
else
} else {
mac = dwmac100_setup(priv->ioaddr);
}
if (!mac)
return -ENOMEM;

Expand Down

0 comments on commit 79c0786

Please sign in to comment.