diff options
| author | Toshiaki Makita <makita.toshiaki@lab.ntt.co.jp> | 2015-03-27 06:31:10 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-03-29 22:33:21 +0200 |
| commit | 8d463504c191c2126d097ac94fb258aabe6d3e62 (patch) | |
| tree | e991def61970a02e7c36b1f00ef421bdb72ebd4a /net/8021q/vlan_dev.c | |
| parent | tc: bpf: generalize pedit action (diff) | |
| download | linux-8d463504c191c2126d097ac94fb258aabe6d3e62.tar.xz linux-8d463504c191c2126d097ac94fb258aabe6d3e62.zip | |
vlan: Add features for stacked vlan device
Stacked vlan devices curretly have few features (GRO, HIGHDMA, LLTX).
Since we have software fallbacks in case the NIC can not handle some
features for multiple vlans, we can add the same features as the lower
vlan devices for stacked vlan devices.
This allows stacked vlan devices to create large (GSO) packets and not to
segment packets. Those packets will be segmented by software on the real
device, or even can be segmented by the NIC once TSO for multiple vlans
becomes enabled by the following patches.
The exception is those related to FCoE, which does not have a software
fallback.
Signed-off-by: Toshiaki Makita <makita.toshiaki@lab.ntt.co.jp>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/8021q/vlan_dev.c')
| -rw-r--r-- | net/8021q/vlan_dev.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/net/8021q/vlan_dev.c b/net/8021q/vlan_dev.c index f196552ec3c4..8b5ab9033b41 100644 --- a/net/8021q/vlan_dev.c +++ b/net/8021q/vlan_dev.c @@ -554,6 +554,7 @@ static int vlan_dev_init(struct net_device *dev) if (dev->features & NETIF_F_VLAN_FEATURES) netdev_warn(real_dev, "VLAN features are set incorrectly. Q-in-Q configurations may not work correctly.\n"); + dev->vlan_features = real_dev->vlan_features & ~NETIF_F_ALL_FCOE; /* ipv6 shared card related stuff */ dev->dev_id = real_dev->dev_id; |