Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3fbcf6bb authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'davem-next.r8169' of git://git.kernel.org/pub/scm/linux/kernel/git/romieu/netdev-2.6

parents 928ad22a 1687b566

drivers/net/r8169.c

+3 −5
Original line number Original line Diff line number Diff line
@@ -435,6 +435,7 @@ enum rtl_register_content { 
	AcceptMulticast	= 0x04,

	AcceptMulticast	= 0x04,

	AcceptMyPhys	= 0x02,

	AcceptMyPhys	= 0x02,

	AcceptAllPhys	= 0x01,

	AcceptAllPhys	= 0x01,

#define RX_CONFIG_ACCEPT_MASK		0x3f





	/* TxConfigBits */

	/* TxConfigBits */

	TxInterFrameGapShift = 24,

	TxInterFrameGapShift = 24,
@@ -3943,11 +3944,8 @@ static int rtl8169_open(struct net_device *dev) 
static void rtl_rx_close(struct rtl8169_private *tp)

static void rtl_rx_close(struct rtl8169_private *tp)

{

{

	void __iomem *ioaddr = tp->mmio_addr;

	void __iomem *ioaddr = tp->mmio_addr;

	u32 rxcfg = RTL_R32(RxConfig);





	rxcfg &= ~(AcceptErr | AcceptRunt | AcceptBroadcast | AcceptMulticast |

	RTL_W32(RxConfig, RTL_R32(RxConfig) & ~RX_CONFIG_ACCEPT_MASK);

		   AcceptMyPhys | AcceptAllPhys);

	RTL_W32(RxConfig, rxcfg);

}

}





static void rtl8169_hw_reset(struct rtl8169_private *tp)

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);

	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) {

	if (tp->mac_version > RTL_GIGA_MAC_VER_06) {

		u32 data = mc_filter[0];

		u32 data = mc_filter[0];