net-next: treewide use is_vlan_dev() helper function.

This patch makes use of is_vlan_dev() function instead of flag
comparison which is exactly done by is_vlan_dev() helper function.

Signed-off-by: Parav Pandit <parav@mellanox.com>
Reviewed-by: Daniel Jurgens <danielj@mellanox.com>
Acked-by: Stephen Hemminger <stephen@networkplumber.org>
Acked-by: Jon Maxwell <jmaxwell37@gmail.com>
Acked-by: Johannes Thumshirn <jth@kernel.org>
Acked-by: Haiyang Zhang <haiyangz@microsoft.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/infiniband/core/cma.c b/drivers/infiniband/core/cma.c
index 3e70a9c5d79d5a50ba3be228cb4174d1f66c98d7..4eb5a80e5d81395b5c6d0ab358c7c40b46a7fc58 100644 (file)
--- a/drivers/infiniband/core/cma.c
+++ b/drivers/infiniband/core/cma.c
@@ -2467,14 +2467,12 @@ static int iboe_tos_to_sl(struct net_device *ndev, int tos)
        struct net_device *dev;
 
        prio = rt_tos2priority(tos);
-       dev = ndev->priv_flags & IFF_802_1Q_VLAN ?
-               vlan_dev_real_dev(ndev) : ndev;
-
+       dev = is_vlan_dev(ndev) ? vlan_dev_real_dev(ndev) : ndev;
        if (dev->num_tc)
                return netdev_get_prio_tc_map(dev, prio);
 
 #if IS_ENABLED(CONFIG_VLAN_8021Q)
-       if (ndev->priv_flags & IFF_802_1Q_VLAN)
+       if (is_vlan_dev(ndev))
                return (vlan_dev_get_egress_qos_mask(ndev, prio) &
                        VLAN_PRIO_MASK) >> VLAN_PRIO_SHIFT;
 #endif

diff --git a/drivers/infiniband/sw/rxe/rxe_net.c b/drivers/infiniband/sw/rxe/rxe_net.c
index 4abdeb359fb4f52cbacde5c3e1f488296c6064c5..d9d15561eb5d13ceea3472c9e3c943b42333f473 100644 (file)
--- a/drivers/infiniband/sw/rxe/rxe_net.c
+++ b/drivers/infiniband/sw/rxe/rxe_net.c
@@ -118,7 +118,7 @@ static struct device *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;

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);
        }

diff --git a/drivers/net/ethernet/chelsio/cxgb3/l2t.c b/drivers/net/ethernet/chelsio/cxgb3/l2t.c
index 5f226eda8cd68751aa7360534f74f59604f88374..52063587e1e9a55b5afc2d261d4e713ad9d0b381 100644 (file)
--- a/drivers/net/ethernet/chelsio/cxgb3/l2t.c
+++ b/drivers/net/ethernet/chelsio/cxgb3/l2t.c
@@ -351,7 +351,7 @@ struct l2t_entry *t3_l2t_get(struct t3cdev *cdev, struct dst_entry *dst,
                e->smt_idx = smt_idx;
                atomic_set(&e->refcnt, 1);
                neigh_replace(e, neigh);
-               if (neigh->dev->priv_flags & IFF_802_1Q_VLAN)
+               if (is_vlan_dev(neigh->dev))
                        e->vlan = vlan_dev_vlan_id(neigh->dev);
                else
                        e->vlan = VLAN_NONE;

diff --git a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c
index f4f569060689c833a320c1d854e125278420ac89..70590144be03c531af009283be19caebc1676180 100644 (file)
--- a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c
+++ b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c
@@ -1805,7 +1805,7 @@ static void check_neigh_update(struct neighbour *neigh)
        const struct device *parent;
        const struct net_device *netdev = neigh->dev;
 
-       if (netdev->priv_flags & IFF_802_1Q_VLAN)
+       if (is_vlan_dev(netdev))
                netdev = vlan_dev_real_dev(netdev);
        parent = netdev->dev.parent;
        if (parent && parent->driver == &cxgb4_driver.driver)
@@ -2111,7 +2111,7 @@ static int cxgb4_inet6addr_handler(struct notifier_block *this,
 #if IS_ENABLED(CONFIG_BONDING)
        struct adapter *adap;
 #endif
-       if (event_dev->priv_flags & IFF_802_1Q_VLAN)
+       if (is_vlan_dev(event_dev))
                event_dev = vlan_dev_real_dev(event_dev);
 #if IS_ENABLED(CONFIG_BONDING)
        if (event_dev->flags & IFF_MASTER) {

diff --git a/drivers/net/ethernet/chelsio/cxgb4/l2t.c b/drivers/net/ethernet/chelsio/cxgb4/l2t.c
index 60a26037a1c675453a8261822c113712c129874a..7c8c5b9a3c22ebb5edb67ab3be378f46bbb83baf 100644 (file)
--- a/drivers/net/ethernet/chelsio/cxgb4/l2t.c
+++ b/drivers/net/ethernet/chelsio/cxgb4/l2t.c
@@ -432,7 +432,7 @@ struct l2t_entry *cxgb4_l2t_get(struct l2t_data *d, struct neighbour *neigh,
        else
                lport = netdev2pinfo(physdev)->lport;
 
-       if (neigh->dev->priv_flags & IFF_802_1Q_VLAN)
+       if (is_vlan_dev(neigh->dev))
                vlan = vlan_dev_vlan_id(neigh->dev);
        else
                vlan = VLAN_NONE;

diff --git a/drivers/net/ethernet/qlogic/netxen/netxen_nic_main.c b/drivers/net/ethernet/qlogic/netxen/netxen_nic_main.c
index 0cf8a3703275123e0b93ce2834a4b7ec64142a46..3b5d7cfa2321bbab436beb0affdc89376429892b 100644 (file)
--- a/drivers/net/ethernet/qlogic/netxen/netxen_nic_main.c
+++ b/drivers/net/ethernet/qlogic/netxen/netxen_nic_main.c
@@ -3264,7 +3264,7 @@ netxen_list_config_ip(struct netxen_adapter *adapter,
                cur = kzalloc(sizeof(struct nx_ip_list), GFP_ATOMIC);
                if (cur == NULL)
                        goto out;
-               if (dev->priv_flags & IFF_802_1Q_VLAN)
+               if (is_vlan_dev(dev))
                        dev = vlan_dev_real_dev(dev);
                cur->master = !!netif_is_bond_master(dev);
                cur->ip_addr = ifa->ifa_address;
@@ -3374,7 +3374,7 @@ static void netxen_config_master(struct net_device *dev, unsigned long event)
            !netif_is_bond_slave(dev)) {
                netxen_config_indev_addr(adapter, master, event);
                for_each_netdev_rcu(&init_net, slave)
-                       if (slave->priv_flags & IFF_802_1Q_VLAN &&
+                       if (is_vlan_dev(slave) &&
                            vlan_dev_real_dev(slave) == master)
                                netxen_config_indev_addr(adapter, slave, event);
        }
@@ -3400,7 +3400,7 @@ recheck:
        if (dev == NULL)
                goto done;
 
-       if (dev->priv_flags & IFF_802_1Q_VLAN) {
+       if (is_vlan_dev(dev)) {
                dev = vlan_dev_real_dev(dev);
                goto recheck;
        }
@@ -3445,7 +3445,7 @@ recheck:
        if (dev == NULL)
                goto done;
 
-       if (dev->priv_flags & IFF_802_1Q_VLAN) {
+       if (is_vlan_dev(dev)) {
                dev = vlan_dev_real_dev(dev);
                goto recheck;
        }

diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c
index 4c0cce962585f61b61a43d780b0cbe64217de02e..b6628aaa6e4a45a8eaecd9d5fc4ea8136d7a07af 100644 (file)
--- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c
+++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c
@@ -4220,7 +4220,7 @@ recheck:
        if (dev == NULL)
                goto done;
 
-       if (dev->priv_flags & IFF_802_1Q_VLAN) {
+       if (is_vlan_dev(dev)) {
                dev = vlan_dev_real_dev(dev);
                goto recheck;
        }
@@ -4256,7 +4256,7 @@ recheck:
        if (dev == NULL)
                goto done;
 
-       if (dev->priv_flags & IFF_802_1Q_VLAN) {
+       if (is_vlan_dev(dev)) {
                dev = vlan_dev_real_dev(dev);
                goto recheck;
        }

diff --git a/drivers/net/hyperv/netvsc_drv.c b/drivers/net/hyperv/netvsc_drv.c
index 72b0c1f7496ee23a459cba2365ce550cabde4903..425285f3659502707cf9590241ac1fe28b8caa7a 100644 (file)
--- a/drivers/net/hyperv/netvsc_drv.c
+++ b/drivers/net/hyperv/netvsc_drv.c
@@ -1605,7 +1605,7 @@ static int netvsc_netdev_event(struct notifier_block *this,
                return NOTIFY_DONE;
 
        /* Avoid Vlan dev with same MAC registering as VF */
-       if (event_dev->priv_flags & IFF_802_1Q_VLAN)
+       if (is_vlan_dev(event_dev))
                return NOTIFY_DONE;
 
        /* Avoid Bonding master dev with same MAC registering as VF */

diff --git a/drivers/scsi/bnx2fc/bnx2fc_fcoe.c b/drivers/scsi/bnx2fc/bnx2fc_fcoe.c
index c639d5a02656abf9678f1ef358c4166e5db04a66..4b9e7761a97ba63505d0065f3ef7d7ad588ced33 100644 (file)
--- a/drivers/scsi/bnx2fc/bnx2fc_fcoe.c
+++ b/drivers/scsi/bnx2fc/bnx2fc_fcoe.c
@@ -2282,7 +2282,7 @@ static int _bnx2fc_create(struct net_device *netdev,
        }
 
        /* obtain physical netdev */
-       if (netdev->priv_flags & IFF_802_1Q_VLAN)
+       if (is_vlan_dev(netdev))
                phys_dev = vlan_dev_real_dev(netdev);
 
        /* verify if the physical device is a netxtreme2 device */
@@ -2320,7 +2320,7 @@ static int _bnx2fc_create(struct net_device *netdev,
                goto ifput_err;
        }
 
-       if (netdev->priv_flags & IFF_802_1Q_VLAN) {
+       if (is_vlan_dev(netdev)) {
                vlan_id = vlan_dev_vlan_id(netdev);
                interface->vlan_enabled = 1;
        }
@@ -2538,7 +2538,7 @@ static bool bnx2fc_match(struct net_device *netdev)
        struct net_device *phys_dev = netdev;
 
        mutex_lock(&bnx2fc_dev_lock);
-       if (netdev->priv_flags & IFF_802_1Q_VLAN)
+       if (is_vlan_dev(netdev))
                phys_dev = vlan_dev_real_dev(netdev);
 
        if (bnx2fc_hba_lookup(phys_dev)) {

diff --git a/drivers/scsi/cxgbi/libcxgbi.c b/drivers/scsi/cxgbi/libcxgbi.c
index 9167bcd9fffe9b3a5fea9005671239a96551aace..bd7d39ecbd2470246a58a8ed3a3fd11367df814f 100644 (file)
--- a/drivers/scsi/cxgbi/libcxgbi.c
+++ b/drivers/scsi/cxgbi/libcxgbi.c
@@ -223,7 +223,7 @@ struct cxgbi_device *cxgbi_device_find_by_netdev(struct net_device *ndev,
        struct cxgbi_device *cdev, *tmp;
        int i;
 
-       if (ndev->priv_flags & IFF_802_1Q_VLAN) {
+       if (is_vlan_dev(ndev)) {
                vdev = ndev;
                ndev = vlan_dev_real_dev(ndev);
                log_debug(1 << CXGBI_DBG_DEV,
@@ -256,7 +256,7 @@ struct cxgbi_device *cxgbi_device_find_by_netdev_rcu(struct net_device *ndev,
        struct cxgbi_device *cdev;
        int i;
 
-       if (ndev->priv_flags & IFF_802_1Q_VLAN) {
+       if (is_vlan_dev(ndev)) {
                vdev = ndev;
                ndev = vlan_dev_real_dev(ndev);
                pr_info("vlan dev %s -> %s.\n", vdev->name, ndev->name);
@@ -290,7 +290,7 @@ static struct cxgbi_device *cxgbi_device_find_by_mac(struct net_device *ndev,
        struct cxgbi_device *cdev, *tmp;
        int i;
 
-       if (ndev->priv_flags & IFF_802_1Q_VLAN) {
+       if (is_vlan_dev(ndev)) {
                vdev = ndev;
                ndev = vlan_dev_real_dev(ndev);
                pr_info("vlan dev %s -> %s.\n", vdev->name, ndev->name);

diff --git a/drivers/scsi/fcoe/fcoe.c b/drivers/scsi/fcoe/fcoe.c
index 59150cad03532e1e1ee15ad0d8fcdf35229d07c3..79160ffae483ccea874038784b4516c1a2eab281 100644 (file)
--- a/drivers/scsi/fcoe/fcoe.c
+++ b/drivers/scsi/fcoe/fcoe.c
@@ -326,8 +326,7 @@ static int fcoe_interface_setup(struct fcoe_interface *fcoe,
 
        /* look for SAN MAC address, if multiple SAN MACs exist, only
         * use the first one for SPMA */
-       real_dev = (netdev->priv_flags & IFF_802_1Q_VLAN) ?
-               vlan_dev_real_dev(netdev) : netdev;
+       real_dev = is_vlan_dev(netdev) ? vlan_dev_real_dev(netdev) : netdev;
        fcoe->realdev = real_dev;
        rcu_read_lock();
        for_each_dev_addr(real_dev, ha) {
@@ -730,7 +729,7 @@ static int fcoe_netdev_config(struct fc_lport *lport, struct net_device *netdev)
        ctlr = fcoe_to_ctlr(fcoe);
 
        /* Figure out the VLAN ID, if any */
-       if (netdev->priv_flags & IFF_802_1Q_VLAN)
+       if (is_vlan_dev(netdev))
                lport->vlan = vlan_dev_vlan_id(netdev);
        else
                lport->vlan = 0;
@@ -959,13 +958,13 @@ static inline int fcoe_em_config(struct fc_lport *lport)
         * Reuse existing offload em instance in case
         * it is already allocated on real eth device
         */
-       if (fcoe->netdev->priv_flags & IFF_802_1Q_VLAN)
+       if (is_vlan_dev(fcoe->netdev))
                cur_real_dev = vlan_dev_real_dev(fcoe->netdev);
        else
                cur_real_dev = fcoe->netdev;
 
        list_for_each_entry(oldfcoe, &fcoe_hostlist, list) {
-               if (oldfcoe->netdev->priv_flags & IFF_802_1Q_VLAN)
+               if (is_vlan_dev(oldfcoe->netdev))
                        old_real_dev = vlan_dev_real_dev(oldfcoe->netdev);
                else
                        old_real_dev = oldfcoe->netdev;
@@ -1563,7 +1562,7 @@ static int fcoe_xmit(struct fc_lport *lport, struct fc_frame *fp)
        skb->protocol = htons(ETH_P_FCOE);
        skb->priority = fcoe->priority;
 
-       if (fcoe->netdev->priv_flags & IFF_802_1Q_VLAN &&
+       if (is_vlan_dev(fcoe->netdev) &&
            fcoe->realdev->features & NETIF_F_HW_VLAN_CTAG_TX) {
                /* must set skb->dev before calling vlan_put_tag */
                skb->dev = fcoe->realdev;
@@ -1794,7 +1793,7 @@ fcoe_hostlist_lookup_realdev_port(struct net_device *netdev)
        struct net_device *real_dev;
 
        list_for_each_entry(fcoe, &fcoe_hostlist, list) {
-               if (fcoe->netdev->priv_flags & IFF_802_1Q_VLAN)
+               if (is_vlan_dev(fcoe->netdev))
                        real_dev = vlan_dev_real_dev(fcoe->netdev);
                else
                        real_dev = fcoe->netdev;

diff --git a/include/rdma/ib_addr.h b/include/rdma/ib_addr.h
index 1beab5532035dc2126405384d44457f183de2a90..4b34c51f859e89406802d9b5b8c3644c81861629 100644 (file)
--- a/include/rdma/ib_addr.h
+++ b/include/rdma/ib_addr.h
@@ -160,8 +160,7 @@ static inline int rdma_addr_gid_offset(struct rdma_dev_addr *dev_addr)
 
 static inline u16 rdma_vlan_dev_vlan_id(const struct net_device *dev)
 {
-       return dev->priv_flags & IFF_802_1Q_VLAN ?
-               vlan_dev_vlan_id(dev) : 0xffff;
+       return is_vlan_dev(dev) ? vlan_dev_vlan_id(dev) : 0xffff;
 }
 
 static inline int rdma_ip2gid(struct sockaddr *addr, union ib_gid *gid)
@@ -326,8 +325,7 @@ static inline u16 rdma_get_vlan_id(union ib_gid *dgid)
 
 static inline struct net_device *rdma_vlan_dev_real_dev(const struct net_device *dev)
 {
-       return dev->priv_flags & IFF_802_1Q_VLAN ?
-               vlan_dev_real_dev(dev) : NULL;
+       return is_vlan_dev(dev) ? vlan_dev_real_dev(dev) : NULL;
 }
 
 #endif /* IB_ADDR_H */

diff --git a/net/hsr/hsr_slave.c b/net/hsr/hsr_slave.c
index f5b60388d02fa255eb20362872be62eb96ce73ea..56080da4aa77ef581f4a3c23b4179d72e511980b 100644 (file)
--- a/net/hsr/hsr_slave.c
+++ b/net/hsr/hsr_slave.c
@@ -12,6 +12,7 @@
 #include "hsr_slave.h"
 #include <linux/etherdevice.h>
 #include <linux/if_arp.h>
+#include <linux/if_vlan.h>
 #include "hsr_main.h"
 #include "hsr_device.h"
 #include "hsr_forward.h"
@@ -81,7 +82,7 @@ static int hsr_check_dev_ok(struct net_device *dev)
                return -EINVAL;
        }
 
-       if (dev->priv_flags & IFF_802_1Q_VLAN) {
+       if (is_vlan_dev(dev)) {
                netdev_info(dev, "HSR on top of VLAN is not yet supported in this driver.\n");
                return -EINVAL;
        }