diff options
author | Paolo Abeni <pabeni@redhat.com> | 2018-03-02 10:03:32 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2018-03-04 18:39:54 -0500 |
commit | 3518e40b3cd8ebce52edaad417ecd1d560f15f1b (patch) | |
tree | b687a7a51532b53070311ff2012a70c6ff8e1ee2 /drivers/net/ipvlan/ipvlan_main.c | |
parent | 51568d69407d939e898a150b13cf48d226f53303 (diff) |
ipvlan: forbid vlan devices on top of ipvlan
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 <pabeni@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ipvlan/ipvlan_main.c')
-rw-r--r-- | drivers/net/ipvlan/ipvlan_main.c | 2 |
1 files changed, 1 insertions, 1 deletions
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) | |||
178 | dev->state = (dev->state & ~IPVLAN_STATE_MASK) | | 178 | dev->state = (dev->state & ~IPVLAN_STATE_MASK) | |
179 | (phy_dev->state & IPVLAN_STATE_MASK); | 179 | (phy_dev->state & IPVLAN_STATE_MASK); |
180 | dev->features = phy_dev->features & IPVLAN_FEATURES; | 180 | dev->features = phy_dev->features & IPVLAN_FEATURES; |
181 | dev->features |= NETIF_F_LLTX; | 181 | dev->features |= NETIF_F_LLTX | NETIF_F_VLAN_CHALLENGED; |
182 | dev->gso_max_size = phy_dev->gso_max_size; | 182 | dev->gso_max_size = phy_dev->gso_max_size; |
183 | dev->gso_max_segs = phy_dev->gso_max_segs; | 183 | dev->gso_max_segs = phy_dev->gso_max_segs; |
184 | dev->hard_header_len = phy_dev->hard_header_len; | 184 | dev->hard_header_len = phy_dev->hard_header_len; |