From: Hayes Wang <hayeswang@realtek.com>
To: <netdev@vger.kernel.org>
Cc: <nic_swsd@realtek.com>, <linux-kernel@vger.kernel.org>,
Hayes Wang <hayeswang@realtek.com>
Subject: [PATCH net 2/2] r8169: fix setting rx vlan
Date: Fri, 12 Sep 2014 11:35:12 +0800 [thread overview]
Message-ID: <1394712342-15778-40-Taiwan-albertk@realtek.com> (raw)
In-Reply-To: <1394712342-15778-38-Taiwan-albertk@realtek.com>
The setting should depend on the new features not the current one.
Signed-off-by: Hayes Wang <hayeswang@realtek.com>
---
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
next prev parent reply other threads:[~2014-09-12 3:39 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-09-12 3:35 [PATCH net 0/2] r8169: fix rx vlan Hayes Wang
2014-09-12 3:35 ` [PATCH net 1/2] r8169: fix the default setting of " Hayes Wang
2014-09-12 19:40 ` Francois Romieu
2014-09-15 3:22 ` Hayes Wang
2014-09-16 0:03 ` Francois Romieu
2014-09-16 3:23 ` Hayes Wang
2014-09-16 3:40 ` [PATCH net] r8169: adjust __rtl8169_set_features Hayes Wang
2014-09-16 19:56 ` David Miller
2014-09-12 3:35 ` Hayes Wang [this message]
2014-09-13 20:53 ` [PATCH net 0/2] r8169: fix rx vlan David Miller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1394712342-15778-40-Taiwan-albertk@realtek.com \
--to=hayeswang@realtek.com \
--cc=linux-kernel@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=nic_swsd@realtek.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).