Extract the code which converts an skb VLAN tag into WQE fields into a small helper. This helper will be used by a follow-up series implementing software USO, to avoid code duplication. Signed-off-by: Joe Damato Reviewed-by: Daniel Machon --- drivers/net/ethernet/mellanox/mlx4/en_tx.c | 33 ++++++++++++++-------- 1 file changed, 21 insertions(+), 12 deletions(-) diff --git a/drivers/net/ethernet/mellanox/mlx4/en_tx.c b/drivers/net/ethernet/mellanox/mlx4/en_tx.c index c5d564e5a581..00210dbae1c3 100644 --- a/drivers/net/ethernet/mellanox/mlx4/en_tx.c +++ b/drivers/net/ethernet/mellanox/mlx4/en_tx.c @@ -861,6 +861,26 @@ static bool mlx4_en_build_dma_wqe(struct mlx4_en_priv *priv, return false; } +static bool mlx4_en_prep_vlan(const struct sk_buff *skb, + union mlx4_wqe_qpn_vlan *qpn_vlan) +{ + u16 vlan_proto; + + if (!skb_vlan_tag_present(skb)) + return false; + + qpn_vlan->vlan_tag = cpu_to_be16(skb_vlan_tag_get(skb)); + vlan_proto = be16_to_cpu(skb->vlan_proto); + if (vlan_proto == ETH_P_8021AD) + qpn_vlan->ins_vlan = MLX4_WQE_CTRL_INS_SVLAN; + else if (vlan_proto == ETH_P_8021Q) + qpn_vlan->ins_vlan = MLX4_WQE_CTRL_INS_CVLAN; + else + qpn_vlan->ins_vlan = 0; + + return true; +} + netdev_tx_t mlx4_en_xmit(struct sk_buff *skb, struct net_device *dev) { struct skb_shared_info *shinfo = skb_shinfo(skb); @@ -902,19 +922,8 @@ netdev_tx_t mlx4_en_xmit(struct sk_buff *skb, struct net_device *dev) nr_txbb = desc_size >> LOG_TXBB_SIZE; bf_ok = ring->bf_enabled; - if (skb_vlan_tag_present(skb)) { - u16 vlan_proto; - - qpn_vlan.vlan_tag = cpu_to_be16(skb_vlan_tag_get(skb)); - vlan_proto = be16_to_cpu(skb->vlan_proto); - if (vlan_proto == ETH_P_8021AD) - qpn_vlan.ins_vlan = MLX4_WQE_CTRL_INS_SVLAN; - else if (vlan_proto == ETH_P_8021Q) - qpn_vlan.ins_vlan = MLX4_WQE_CTRL_INS_CVLAN; - else - qpn_vlan.ins_vlan = 0; + if (mlx4_en_prep_vlan(skb, &qpn_vlan)) bf_ok = false; - } netdev_txq_bql_enqueue_prefetchw(ring->tx_queue); -- 2.53.1-Meta