net: lan78xx: Add support for VLAN filtering.
authorDave Stevenson <dave.stevenson@raspberrypi.org>
Mon, 25 Jun 2018 14:07:13 +0000 (15:07 +0100)
committerDavid S. Miller <davem@davemloft.net>
Tue, 26 Jun 2018 13:53:29 +0000 (22:53 +0900)
HW_VLAN_CTAG_FILTER was partially implemented, but not advertised
to Linux.

Complete the implementation of this.

Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/usb/lan78xx.c

index 1a1d3cc..bd41a36 100644 (file)
@@ -2363,7 +2363,7 @@ static int lan78xx_set_features(struct net_device *netdev,
                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_;
@@ -2976,6 +2976,9 @@ static int lan78xx_bind(struct lan78xx_net *dev, struct usb_interface *intf)
        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);