Re: [PATCH net V2 1/2] macvlan: forbid L2 fowarding offload for macvtap
From: Neil Horman <nhorman@tuxdriver.com>
Date: 2014-01-09 12:20:20
Also in:
lkml
On Thu, Jan 09, 2014 at 05:37:31PM +0800, Jason Wang wrote:
quoted hunk ↗ jump to hunk
L2 fowarding offload will bypass the rx handler of real device. This will make the packet could not be forwarded to macvtap device. Another problem is the dev_hard_start_xmit() called for macvtap does not have any synchronization. Fix this by forbidding L2 forwarding for macvtap. Cc: John Fastabend <redacted> Cc: Neil Horman <nhorman@tuxdriver.com> Signed-off-by: Jason Wang <redacted> --- drivers/net/macvlan.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-)diff --git a/drivers/net/macvlan.c b/drivers/net/macvlan.c index 60406b0..5360f73 100644 --- a/drivers/net/macvlan.c +++ b/drivers/net/macvlan.c@@ -338,6 +338,8 @@ 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);@@ -353,7 +355,8 @@ static int macvlan_open(struct net_device *dev) goto hash_add; } - if (lowerdev->features & NETIF_F_HW_L2FW_DOFFLOAD) { + if (lowerdev->features & NETIF_F_HW_L2FW_DOFFLOAD && + dev->rtnl_link_ops == &macvlan_link_ops) { vlan->fwd_priv = lowerdev->netdev_ops->ndo_dfwd_add_station(lowerdev, dev);
Acked-by: Neil Horman <nhorman@tuxdriver.com>