Merge tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dledford/rdma

[sfrench/cifs-2.6.git] / drivers / infiniband / sw / rxe / rxe_net.c

diff --git a/drivers/infiniband/sw/rxe/rxe_net.c b/drivers/infiniband/sw/rxe/rxe_net.c
index ef68ec261445ccfd87002c054df849873b855d16..d8610960630ac54998ddd33531c77b2b898e247c 100644 (file)
--- a/drivers/infiniband/sw/rxe/rxe_net.c
+++ b/drivers/infiniband/sw/rxe/rxe_net.c
@@ -118,7 +118,7 @@ struct device *rxe_dma_device(struct rxe_dev *rxe)
 
        ndev = rxe->ndev;
 
-       if (ndev->priv_flags & IFF_802_1Q_VLAN)
+       if (is_vlan_dev(ndev))
                ndev = vlan_dev_real_dev(ndev);
 
        return ndev->dev.parent;