diff options
| author | Toshiaki Makita <makita.toshiaki@lab.ntt.co.jp> | 2015-03-27 01:31:12 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-03-29 16:33:22 -0400 |
| commit | 8cb65d00086bfba22bac87ff18b751432fc74003 (patch) | |
| tree | 93911010d1ed7f433b57456af85680c13bf227f8 /drivers/net/ethernet/qlogic | |
| parent | f5a7fb88e1f82542ca14ba93a1d4fa35471c60ca (diff) | |
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')
| -rw-r--r-- | drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c | 1 |
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 a430a34a4434..367f3976df56 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, | |||
| 507 | struct net_device *dev, | 507 | struct net_device *dev, |
| 508 | netdev_features_t features) | 508 | netdev_features_t features) |
| 509 | { | 509 | { |
| 510 | features = vlan_features_check(skb, features); | ||
| 510 | return vxlan_features_check(skb, features); | 511 | return vxlan_features_check(skb, features); |
| 511 | } | 512 | } |
| 512 | #endif | 513 | #endif |