diff options
author | David S. Miller <davem@davemloft.net> | 2012-04-10 14:30:45 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2012-04-10 14:30:45 -0400 |
commit | 06eb4eafbdc0796d741d139a44f1253278da8611 (patch) | |
tree | fbdb44317130c371928154c9e6903e699fe2b995 /drivers/net/ethernet/stmicro | |
parent | 32ed53b83ea5ec26a4dba90e18f5e0ff6c71eb48 (diff) | |
parent | f68e556e23d1a4176b563bcb25d8baf2c5313f91 (diff) |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Diffstat (limited to 'drivers/net/ethernet/stmicro')
-rw-r--r-- | drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c index 90d5c4c75d25..a64f0d422e76 100644 --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | |||
@@ -1784,10 +1784,12 @@ static int stmmac_hw_init(struct stmmac_priv *priv) | |||
1784 | struct mac_device_info *mac; | 1784 | struct mac_device_info *mac; |
1785 | 1785 | ||
1786 | /* Identify the MAC HW device */ | 1786 | /* Identify the MAC HW device */ |
1787 | if (priv->plat->has_gmac) | 1787 | if (priv->plat->has_gmac) { |
1788 | priv->dev->priv_flags |= IFF_UNICAST_FLT; | ||
1788 | mac = dwmac1000_setup(priv->ioaddr); | 1789 | mac = dwmac1000_setup(priv->ioaddr); |
1789 | else | 1790 | } else { |
1790 | mac = dwmac100_setup(priv->ioaddr); | 1791 | mac = dwmac100_setup(priv->ioaddr); |
1792 | } | ||
1791 | if (!mac) | 1793 | if (!mac) |
1792 | return -ENOMEM; | 1794 | return -ENOMEM; |
1793 | 1795 | ||