]> git.proxmox.com Git - mirror_ubuntu-eoan-kernel.git/commitdiff
net/mlx5e: Remove the wrong assumption about transport offset
authorMaxim Mikityanskiy <maximmi@mellanox.com>
Thu, 21 Feb 2019 12:40:04 +0000 (12:40 +0000)
committerDavid S. Miller <davem@davemloft.net>
Fri, 22 Feb 2019 20:55:32 +0000 (12:55 -0800)
skb_transport_offset() == 0 is not a special value. The only special
value is when skb->transport_header is ~0U, and it's checked by
skb_transport_header_was_set().

Signed-off-by: Maxim Mikityanskiy <maximmi@mellanox.com>
Reviewed-by: Saeed Mahameed <saeedm@mellanox.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/ethernet/mellanox/mlx5/core/en_tx.c

index c1334a8ac8f34e24523cf7518649faad4b6311ad..6ca8347023068b865a30e8105ab5dfebcda639a9 100644 (file)
@@ -172,15 +172,8 @@ static inline u16 mlx5e_calc_min_inline(enum mlx5_inline_modes mode,
                        hlen += VLAN_HLEN;
                break;
        case MLX5_INLINE_MODE_IP:
-               /* When transport header is set to zero, it means no transport
-                * header. When transport header is set to 0xff's, it means
-                * transport header wasn't set.
-                */
-               if (skb_transport_offset(skb)) {
-                       hlen = mlx5e_skb_l3_header_offset(skb);
-                       break;
-               }
-               /* fall through */
+               hlen = mlx5e_skb_l3_header_offset(skb);
+               break;
        case MLX5_INLINE_MODE_L2:
        default:
                hlen = mlx5e_skb_l2_header_offset(skb);