aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/ethernet/realtek
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2012-11-10 18:32:51 -0500
committerDavid S. Miller <davem@davemloft.net>2012-11-10 18:32:51 -0500
commitd4185bbf62a5d8d777ee445db1581beb17882a07 (patch)
tree024b0badbd7c970b1983be6d8c345cc4a290cb31 /drivers/net/ethernet/realtek
parentc075b13098b399dc565b4d53f42047a8d40ed3ba (diff)
parenta375413311b39005ef281bfd71ae8f4e3df22e97 (diff)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts: drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c Minor conflict between the BCM_CNIC define removal in net-next and a bug fix added to net. Based upon a conflict resolution patch posted by Stephen Rothwell. Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/realtek')
-rw-r--r--drivers/net/ethernet/realtek/r8169.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/net/ethernet/realtek/r8169.c b/drivers/net/ethernet/realtek/r8169.c
index d6c6cfb68631..50a55fb10368 100644
--- a/drivers/net/ethernet/realtek/r8169.c
+++ b/drivers/net/ethernet/realtek/r8169.c
@@ -3865,6 +3865,8 @@ static void rtl_wol_suspend_quirk(struct rtl8169_private *tp)
3865 void __iomem *ioaddr = tp->mmio_addr; 3865 void __iomem *ioaddr = tp->mmio_addr;
3866 3866
3867 switch (tp->mac_version) { 3867 switch (tp->mac_version) {
3868 case RTL_GIGA_MAC_VER_25:
3869 case RTL_GIGA_MAC_VER_26:
3868 case RTL_GIGA_MAC_VER_29: 3870 case RTL_GIGA_MAC_VER_29:
3869 case RTL_GIGA_MAC_VER_30: 3871 case RTL_GIGA_MAC_VER_30:
3870 case RTL_GIGA_MAC_VER_32: 3872 case RTL_GIGA_MAC_VER_32:
@@ -4557,6 +4559,9 @@ static void rtl_set_rx_mode(struct net_device *dev)
4557 mc_filter[1] = swab32(data); 4559 mc_filter[1] = swab32(data);
4558 } 4560 }
4559 4561
4562 if (tp->mac_version == RTL_GIGA_MAC_VER_35)
4563 mc_filter[1] = mc_filter[0] = 0xffffffff;
4564
4560 RTL_W32(MAR0 + 4, mc_filter[1]); 4565 RTL_W32(MAR0 + 4, mc_filter[1]);
4561 RTL_W32(MAR0 + 0, mc_filter[0]); 4566 RTL_W32(MAR0 + 0, mc_filter[0]);
4562 4567