From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753956AbaILDjc (ORCPT ); Thu, 11 Sep 2014 23:39:32 -0400 Received: from rtits2.realtek.com ([60.250.210.242]:55316 "EHLO rtits2.realtek.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753078AbaILDja (ORCPT ); Thu, 11 Sep 2014 23:39:30 -0400 Authenticated-By: X-SpamFilter-By: BOX Solutions SpamTrap 5.49 with qID s8C3dMuO015393, This message is accepted by code: ctloc85258 From: Hayes Wang To: CC: , , Hayes Wang Subject: [PATCH net 2/2] r8169: fix setting rx vlan Date: Fri, 12 Sep 2014 11:35:12 +0800 Message-ID: <1394712342-15778-40-Taiwan-albertk@realtek.com> X-Mailer: Microsoft Office Outlook 11 In-Reply-To: <1394712342-15778-38-Taiwan-albertk@realtek.com> References: <1394712342-15778-38-Taiwan-albertk@realtek.com> MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [172.21.71.44] Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The setting should depend on the new features not the current one. Signed-off-by: Hayes Wang --- drivers/net/ethernet/realtek/r8169.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/ethernet/realtek/r8169.c b/drivers/net/ethernet/realtek/r8169.c index f3ce284..7a7860a 100644 --- a/drivers/net/ethernet/realtek/r8169.c +++ b/drivers/net/ethernet/realtek/r8169.c @@ -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; -- 1.9.3