[ovs-dev,branch-2.7,05/25] datapath: add NETIF_F_HW_VLAN_STAG_TX to internal dev.

Message ID 1489620689-122370-6-git-send-email-jarno@ovn.org
State Superseded
Headers show

Commit Message

Jarno Rajahalme March 15, 2017, 11:31 p.m.
From: Jiri Benc <jbenc@redhat.com>

Upstream commit:
    commit 3145c037e74926dea9241a3f68ada6f294b0119a
    Author: Jiri Benc <jbenc@redhat.com>
    Date:   Mon Oct 10 17:02:44 2016 +0200

    openvswitch: add NETIF_F_HW_VLAN_STAG_TX to internal dev

    The internal device does support 802.1AD offloading since 018c1dda5ff1
    ("openvswitch: 802.1AD Flow handling, actions, vlan parsing, netlink

    Signed-off-by: Jiri Benc <jbenc@redhat.com>
    Acked-by: Pravin B Shelar <pshelar@ovn.org>
    Acked-by: Eric Garver <e@erig.me>
    Signed-off-by: David S. Miller <davem@davemloft.net>

Upstream: 3145c037e749 ("openvswitch: add NETIF_F_HW_VLAN_STAG_TX to internal dev")
Signed-off-by: Joe Stringer <joe@ovn.org>
Acked-by: Jarno Rajahalme <jarno@ovn.org>
Signed-off-by: Jarno Rajahalme <jarno@ovn.org>
 datapath/vport-internal_dev.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


diff --git a/datapath/vport-internal_dev.c b/datapath/vport-internal_dev.c
index cc01c9c..f0542a5 100644
--- a/datapath/vport-internal_dev.c
+++ b/datapath/vport-internal_dev.c
@@ -188,7 +188,7 @@  static void do_setup(struct net_device *netdev)
 	netdev->vlan_features = netdev->features;
 	netdev->hw_enc_features = netdev->features;
-	netdev->features |= NETIF_F_HW_VLAN_CTAG_TX;
+	netdev->features |= NETIF_F_HW_VLAN_CTAG_TX | NETIF_F_HW_VLAN_STAG_TX;
 	netdev->hw_features = netdev->features & ~NETIF_F_LLTX;