diff options
| author | David S. Miller <davem@davemloft.net> | 2014-03-28 17:17:16 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-03-28 17:17:16 -0400 |
| commit | 5f2feca20e0f4878fa16787bd50fcd82fb365be7 (patch) | |
| tree | 1761471976beb97edab677ab211326b62a2809ad /net | |
| parent | fc92f745f8d0d3736ce5afb00a905d7cc61f9c46 (diff) | |
| parent | 2adb956b084d6d49f519541a4b5f9947e96f8ef7 (diff) | |
Merge branch 'vlan_offloads'
Vlad Yasevich says:
====================
Audit all drivers for correct vlan_features.
Some drivers set vlan acceleration features in vlan_features. This causes
issues with Q-in-Q/802.1ad configurations.
Audit all the drivers for correct vlan_features. Fix broken ones.
Add a warning to vlan code to help catch future offenders.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
| -rw-r--r-- | net/8021q/vlan_dev.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/net/8021q/vlan_dev.c b/net/8021q/vlan_dev.c index a9591ff2b678..27bfe2f8e2de 100644 --- a/net/8021q/vlan_dev.c +++ b/net/8021q/vlan_dev.c @@ -578,6 +578,9 @@ static int vlan_dev_init(struct net_device *dev) dev->features |= real_dev->vlan_features | NETIF_F_LLTX; dev->gso_max_size = real_dev->gso_max_size; + 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"); + /* ipv6 shared card related stuff */ dev->dev_id = real_dev->dev_id; |