Merge tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux

[karo-tx-linux.git] / drivers / net / ethernet / broadcom / cnic.c

diff --git a/drivers/net/ethernet/broadcom/cnic.c b/drivers/net/ethernet/broadcom/cnic.c
index b1d2ac818710b36328a6e0d50a77c2436d57a850..cec94bbb2ea5ad17a7bec44a76d34c0d8f9cd128 100644 (file)
--- a/drivers/net/ethernet/broadcom/cnic.c
+++ b/drivers/net/ethernet/broadcom/cnic.c
@@ -3665,7 +3665,7 @@ static int cnic_cm_destroy(struct cnic_sock *csk)
 static inline u16 cnic_get_vlan(struct net_device *dev,
                                struct net_device **vlan_dev)
 {
-       if (dev->priv_flags & IFF_802_1Q_VLAN) {
+       if (is_vlan_dev(dev)) {
                *vlan_dev = vlan_dev_real_dev(dev);
                return vlan_dev_vlan_id(dev);
        }