summaryrefslogtreecommitdiffstats
path: root/drivers/net/ethernet/qlogic/qlcnic
diff options
context:
space:
mode:
authorToshiaki Makita <makita.toshiaki@lab.ntt.co.jp>2015-03-27 14:31:12 +0900
committerDavid S. Miller <davem@davemloft.net>2015-03-29 13:33:22 -0700
commit8cb65d00086bfba22bac87ff18b751432fc74003 (patch)
tree93911010d1ed7f433b57456af85680c13bf227f8 /drivers/net/ethernet/qlogic/qlcnic
parentf5a7fb88e1f82542ca14ba93a1d4fa35471c60ca (diff)
downloadop-kernel-dev-8cb65d00086bfba22bac87ff18b751432fc74003.zip
op-kernel-dev-8cb65d00086bfba22bac87ff18b751432fc74003.tar.gz
net: Move check for multiple vlans to drivers
To allow drivers to handle the features check for multiple tags, move the check to ndo_features_check(). As no drivers currently handle multiple tagged TSO, introduce dflt_features_check() and call it if the driver does not have ndo_features_check(). Signed-off-by: Toshiaki Makita <makita.toshiaki@lab.ntt.co.jp> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/qlogic/qlcnic')
-rw-r--r--drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c
index a430a34a..367f397 100644
--- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c
+++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c
@@ -507,6 +507,7 @@ static netdev_features_t qlcnic_features_check(struct sk_buff *skb,
struct net_device *dev,
netdev_features_t features)
{
+ features = vlan_features_check(skb, features);
return vxlan_features_check(skb, features);
}
#endif
OpenPOWER on IntegriCloud