You cannot select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
37 lines
1.2 KiB
Diff
37 lines
1.2 KiB
Diff
From c9101bf318db158e88e293aface9ce952657d958 Mon Sep 17 00:00:00 2001
|
|
From: Dave Stevenson <dave.stevenson@raspberrypi.org>
|
|
Date: Tue, 10 Apr 2018 12:39:06 +0100
|
|
Subject: [PATCH 270/454] net: lan78xx: Add support for VLAN filtering.
|
|
|
|
HW_VLAN_CTAG_FILTER was partially implemented, but not fully to Linux.
|
|
Complete the implementation of this.
|
|
|
|
See #2458.
|
|
|
|
Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org>
|
|
---
|
|
drivers/net/usb/lan78xx.c | 5 ++++-
|
|
1 file changed, 4 insertions(+), 1 deletion(-)
|
|
|
|
--- a/drivers/net/usb/lan78xx.c
|
|
+++ b/drivers/net/usb/lan78xx.c
|
|
@@ -2280,7 +2280,7 @@ static int lan78xx_set_features(struct n
|
|
pdata->rfe_ctl &= ~(RFE_CTL_ICMP_COE_ | RFE_CTL_IGMP_COE_);
|
|
}
|
|
|
|
- if (features & NETIF_F_HW_VLAN_CTAG_RX)
|
|
+ if (features & NETIF_F_HW_VLAN_CTAG_FILTER)
|
|
pdata->rfe_ctl |= RFE_CTL_VLAN_FILTER_;
|
|
else
|
|
pdata->rfe_ctl &= ~RFE_CTL_VLAN_FILTER_;
|
|
@@ -2895,6 +2895,9 @@ static int lan78xx_bind(struct lan78xx_n
|
|
if (DEFAULT_TSO_CSUM_ENABLE)
|
|
dev->net->features |= NETIF_F_TSO | NETIF_F_TSO6 | NETIF_F_SG;
|
|
|
|
+ if (DEFAULT_VLAN_FILTER_ENABLE)
|
|
+ dev->net->features |= NETIF_F_HW_VLAN_CTAG_FILTER;
|
|
+
|
|
dev->net->hw_features = dev->net->features;
|
|
|
|
ret = lan78xx_setup_irq_domain(dev);
|