diff options
author | Julian Wiedmann <jwi@linux.ibm.com> | 2019-01-25 15:44:23 +0100 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2019-01-25 21:23:56 -0800 |
commit | 5fc692a7ffaf635588625aae8af6c3bc14dd6ea5 (patch) | |
tree | bd1ffec50cacb0bd22a6f69d52772899df063edf /drivers/s390/net/qeth_core_mpc.h | |
parent | e6e771b3d8975ec88009f03826c6921d78edc9bf (diff) | |
download | blackbird-op-linux-5fc692a7ffaf635588625aae8af6c3bc14dd6ea5.tar.gz blackbird-op-linux-5fc692a7ffaf635588625aae8af6c3bc14dd6ea5.zip |
s390/qeth: remove VLAN tracking for L2 devices
For recovery purposes, qeth keeps track of all registered VIDs. Replace
this by using the infrastructure introduced in
commit 9daae9bd47cf ("net: Call add/kill vid ndo on vlan filter feature toggling").
By managing NETIF_F_HW_VLAN_CTAG_FILTER as a hw_feature,
netdev_update_features() will select it from dev->wanted_features
and replay all of the netdevice's VIDs to its ndo_vlan_rx_add_vid()
callback.
z/VM NICs strictly require VLAN registration, so don't expose it as
hw_feature there but add a little hack in qeth_enable_hw_features()
to make things work regardless.
Signed-off-by: Julian Wiedmann <jwi@linux.ibm.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/s390/net/qeth_core_mpc.h')
-rw-r--r-- | drivers/s390/net/qeth_core_mpc.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/s390/net/qeth_core_mpc.h b/drivers/s390/net/qeth_core_mpc.h index 1ab321926f64..c7fb14a61eed 100644 --- a/drivers/s390/net/qeth_core_mpc.h +++ b/drivers/s390/net/qeth_core_mpc.h @@ -81,6 +81,7 @@ enum qeth_card_types { #define IS_IQD(card) ((card)->info.type == QETH_CARD_TYPE_IQD) #define IS_OSD(card) ((card)->info.type == QETH_CARD_TYPE_OSD) +#define IS_OSM(card) ((card)->info.type == QETH_CARD_TYPE_OSM) #define IS_OSN(card) ((card)->info.type == QETH_CARD_TYPE_OSN) #define IS_VM_NIC(card) ((card)->info.guestlan) |