diff options
author | Michał Mirosław <mirq-linux@rere.qmqm.pl> | 2013-01-29 15:14:16 +0000 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2013-01-29 22:58:40 -0500 |
commit | d2ed273d30c5ffd14f6b5ec7ecc751d960f832fc (patch) | |
tree | 3a127f68981cd7536303fb111ee2668af44003e9 /net/8021q/vlan.c | |
parent | 29e3b1608c8dca3ae4224a26862d18ea003ccee6 (diff) | |
download | op-kernel-dev-d2ed273d30c5ffd14f6b5ec7ecc751d960f832fc.zip op-kernel-dev-d2ed273d30c5ffd14f6b5ec7ecc751d960f832fc.tar.gz |
net: disallow drivers with buggy VLAN accel to register_netdevice()
Instead of jumping aroung bugs that are easily fixed just don't let them in:
affected drivers should be either fixed or have NETIF_F_HW_VLAN_FILTER
removed from advertised features.
Quick grep in drivers/net shows two drivers that have NETIF_F_HW_VLAN_FILTER
but not ndo_vlan_rx_add/kill_vid(), but those are false-positives (features
are commented out).
OTOH two drivers have ndo_vlan_rx_add/kill_vid() implemented but don't
advertise NETIF_F_HW_VLAN_FILTER. Those are:
+ethernet/cisco/enic/enic_main.c
+ethernet/qlogic/qlcnic/qlcnic_main.c
Signed-off-by: Michał Mirosław <mirq-linux@rere.qmqm.pl>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/8021q/vlan.c')
-rw-r--r-- | net/8021q/vlan.c | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/net/8021q/vlan.c b/net/8021q/vlan.c index babfde9..addc578 100644 --- a/net/8021q/vlan.c +++ b/net/8021q/vlan.c @@ -117,19 +117,12 @@ void unregister_vlan_dev(struct net_device *dev, struct list_head *head) int vlan_check_real_dev(struct net_device *real_dev, u16 vlan_id) { const char *name = real_dev->name; - const struct net_device_ops *ops = real_dev->netdev_ops; if (real_dev->features & NETIF_F_VLAN_CHALLENGED) { pr_info("VLANs not supported on %s\n", name); return -EOPNOTSUPP; } - if ((real_dev->features & NETIF_F_HW_VLAN_FILTER) && - (!ops->ndo_vlan_rx_add_vid || !ops->ndo_vlan_rx_kill_vid)) { - pr_info("Device %s has buggy VLAN hw accel\n", name); - return -EOPNOTSUPP; - } - if (vlan_find_dev(real_dev, vlan_id) != NULL) return -EEXIST; |