From 6cf73ae264ccc4999a2c19118a795dcd17388ed5 Mon Sep 17 00:00:00 2001 From: Alexander Duyck Date: Mon, 16 Oct 2017 22:44:44 -0400 Subject: [PATCH] macvlan/macvtap: Add support for L2 forwarding offloads with macvtap This patch reverts earlier commit e316a5f119df ("macvlan: forbid L2 fowarding offload for macvtap"). The reason for reverting this is because the original patch no longer fixes what it previously did as the underlying structure has changed for macvtap. Specifically macvtap originally pulled packets directly off of the lowerdev. However in commit 747f4bfed381 ("macvtap: Add support of packet capture on macvtap device.") that code was changed and instead macvtap would listen directly on the macvtap device itself instead of the lower device. As such, the L2 forwarding offload should now be able to provide a performance advantage of skipping the checks on the lower dev while not introducing any sort of regression. Signed-off-by: Alexander Duyck Signed-off-by: David S. Miller --- drivers/net/macvlan.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/drivers/net/macvlan.c b/drivers/net/macvlan.c index 1e1df54c5d317..a178c5efd33e5 100644 --- a/drivers/net/macvlan.c +++ b/drivers/net/macvlan.c @@ -598,8 +598,6 @@ static const struct header_ops macvlan_hard_header_ops = { .cache_update = eth_header_cache_update, }; -static struct rtnl_link_ops macvlan_link_ops; - static int macvlan_open(struct net_device *dev) { struct macvlan_dev *vlan = netdev_priv(dev); @@ -615,8 +613,7 @@ static int macvlan_open(struct net_device *dev) goto hash_add; } - if (lowerdev->features & NETIF_F_HW_L2FW_DOFFLOAD && - dev->rtnl_link_ops == &macvlan_link_ops) { + if (lowerdev->features & NETIF_F_HW_L2FW_DOFFLOAD) { vlan->fwd_priv = lowerdev->netdev_ops->ndo_dfwd_add_station(lowerdev, dev); -- 2.39.5