net/mlx5e: Trust kernel regarding transport offset
authorMaxim Mikityanskiy <maximmi@mellanox.com>
Thu, 21 Feb 2019 12:40:05 +0000 (12:40 +0000)
committerDavid S. Miller <davem@davemloft.net>
Fri, 22 Feb 2019 20:55:32 +0000 (12:55 -0800)
After AF_PACKET is fixed to calculate the transport header offset
correctly, trust the value set by the kernel. If the offset wasn't set,
it means there is no transport header in the packet.

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 6ca8347023068b865a30e8105ab5dfebcda639a9..e7aae45a01f8d76800d770e695c5966c9ae3f4f5 100644 (file)
@@ -148,12 +148,8 @@ static inline int mlx5e_skb_l2_header_offset(struct sk_buff *skb)
 
 static inline int mlx5e_skb_l3_header_offset(struct sk_buff *skb)
 {
-       struct flow_keys keys;
-
        if (skb_transport_header_was_set(skb))
                return skb_transport_offset(skb);
-       else if (skb_flow_dissect_flow_keys(skb, &keys, 0))
-               return keys.control.thoff;
        else
                return mlx5e_skb_l2_header_offset(skb);
 }