Re: [PATCH net-next] ipvlan: forbid vlan devices on top of ipvlan

2018-03-04 Thread David Miller
From: Paolo Abeni 
Date: Fri,  2 Mar 2018 16:03:32 +0100

> Currently we allow the creation of 8021q devices on top of
> ipvlan, but such devices are nonfunctional, as the underlying
> ipvlan rx_hanlder hook can't match the relevant traffic.
> 
> Be explicit and forbid the creation of such nonfunctional devices.
> 
> Signed-off-by: Paolo Abeni 

Applied.


[PATCH net-next] ipvlan: forbid vlan devices on top of ipvlan

2018-03-02 Thread Paolo Abeni
Currently we allow the creation of 8021q devices on top of
ipvlan, but such devices are nonfunctional, as the underlying
ipvlan rx_hanlder hook can't match the relevant traffic.

Be explicit and forbid the creation of such nonfunctional devices.

Signed-off-by: Paolo Abeni 
---
 drivers/net/ipvlan/ipvlan_main.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/net/ipvlan/ipvlan_main.c b/drivers/net/ipvlan/ipvlan_main.c
index 3efc1c92c6a7..4cbe9e27287d 100644
--- a/drivers/net/ipvlan/ipvlan_main.c
+++ b/drivers/net/ipvlan/ipvlan_main.c
@@ -178,7 +178,7 @@ static int ipvlan_init(struct net_device *dev)
dev->state = (dev->state & ~IPVLAN_STATE_MASK) |
 (phy_dev->state & IPVLAN_STATE_MASK);
dev->features = phy_dev->features & IPVLAN_FEATURES;
-   dev->features |= NETIF_F_LLTX;
+   dev->features |= NETIF_F_LLTX | NETIF_F_VLAN_CHALLENGED;
dev->gso_max_size = phy_dev->gso_max_size;
dev->gso_max_segs = phy_dev->gso_max_segs;
dev->hard_header_len = phy_dev->hard_header_len;
-- 
2.14.3