Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d0d7b10b authored by Parav Pandit's avatar Parav Pandit Committed by David S. Miller
Browse files

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: default avatarParav Pandit <parav@mellanox.com>
Reviewed-by: default avatarDaniel Jurgens <danielj@mellanox.com>
Acked-by: default avatarStephen Hemminger <stephen@networkplumber.org>
Acked-by: default avatarJon Maxwell <jmaxwell37@gmail.com>
Acked-by: default avatarJohannes Thumshirn <jth@kernel.org>
Acked-by: default avatarHaiyang Zhang <haiyangz@microsoft.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 73cfb2a2

drivers/infiniband/core/cma.c

+2 −4
Original line number Diff line number Diff line
@@ -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

drivers/infiniband/sw/rxe/rxe_net.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

drivers/net/ethernet/broadcom/cnic.c

+1 −1
Original line number Diff line number Diff line
@@ -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);

	}

drivers/net/ethernet/chelsio/cxgb3/l2t.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c

+2 −2
Original line number Diff line number Diff line
@@ -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) {