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

Commit 638898f1 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'r8169-net' 



Hayes Wang says:

====================
r8169: fix rx vlan

There are two issues for hw rx vlan. The patches are
used to fix them.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 618073e3 36d8e825

drivers/net/ethernet/realtek/r8169.c

+7 −2
Original line number Diff line number Diff line
@@ -1796,7 +1796,7 @@ static void __rtl8169_set_features(struct net_device *dev, 
		else

			tp->cp_cmd &= ~RxChkSum;



		if (dev->features & NETIF_F_HW_VLAN_CTAG_RX)

		if (features & NETIF_F_HW_VLAN_CTAG_RX)

			tp->cp_cmd |= RxVlan;

		else

			tp->cp_cmd &= ~RxVlan;
@@ -6707,7 +6707,12 @@ static int rtl_open(struct net_device *dev) 


	rtl8169_init_phy(dev, tp);



	__rtl8169_set_features(dev, dev->features);

	if (dev->features & NETIF_F_HW_VLAN_CTAG_RX)

		tp->cp_cmd |= RxVlan;

	else

		tp->cp_cmd &= ~RxVlan;



	RTL_W16(CPlusCmd, tp->cp_cmd);



	rtl_pll_power_up(tp);