diff options
| author | David S. Miller <davem@davemloft.net> | 2011-07-19 10:11:21 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-07-19 10:11:21 -0700 |
| commit | 3fbcf6bb55686c36086c8ab15fe9ee5a63eb79d4 (patch) | |
| tree | b34d711bd8b9f78107008de644cc6210fb47aae5 /drivers | |
| parent | 928ad22a3b033a994081dbf49f3c046195dd2349 (diff) | |
| parent | 1687b56679880a47164ae149530abee543f9d6b1 (diff) | |
| download | blackbird-op-linux-3fbcf6bb55686c36086c8ab15fe9ee5a63eb79d4.tar.gz blackbird-op-linux-3fbcf6bb55686c36086c8ab15fe9ee5a63eb79d4.zip | |
Merge branch 'davem-next.r8169' of git://git.kernel.org/pub/scm/linux/kernel/git/romieu/netdev-2.6
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/net/r8169.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/drivers/net/r8169.c b/drivers/net/r8169.c index 3ddd33936aa7..40bcb82d9116 100644 --- a/drivers/net/r8169.c +++ b/drivers/net/r8169.c @@ -435,6 +435,7 @@ enum rtl_register_content { AcceptMulticast = 0x04, AcceptMyPhys = 0x02, AcceptAllPhys = 0x01, +#define RX_CONFIG_ACCEPT_MASK 0x3f /* TxConfigBits */ TxInterFrameGapShift = 24, @@ -3943,11 +3944,8 @@ err_pm_runtime_put: static void rtl_rx_close(struct rtl8169_private *tp) { void __iomem *ioaddr = tp->mmio_addr; - u32 rxcfg = RTL_R32(RxConfig); - rxcfg &= ~(AcceptErr | AcceptRunt | AcceptBroadcast | AcceptMulticast | - AcceptMyPhys | AcceptAllPhys); - RTL_W32(RxConfig, rxcfg); + RTL_W32(RxConfig, RTL_R32(RxConfig) & ~RX_CONFIG_ACCEPT_MASK); } static void rtl8169_hw_reset(struct rtl8169_private *tp) @@ -5586,7 +5584,7 @@ static void rtl_set_rx_mode(struct net_device *dev) spin_lock_irqsave(&tp->lock, flags); - tmp = RTL_R32(RxConfig) | rx_mode; + tmp = (RTL_R32(RxConfig) & ~RX_CONFIG_ACCEPT_MASK) | rx_mode; if (tp->mac_version > RTL_GIGA_MAC_VER_06) { u32 data = mc_filter[0]; |
