Commit e2fdfd71 authored by Vladimir Oltean's avatar Vladimir Oltean Committed by David S. Miller
Browse files

net: dpaa: avoid one skb_reset_mac_header() in dpaa_enable_tx_csum() 



It appears that dpaa_enable_tx_csum() only calls skb_reset_mac_header()
to get to the VLAN header using skb_mac_header().

We can use skb_vlan_eth_hdr() to get to the VLAN header based on
skb->data directly. This avoids spending a few cycles to set
skb->mac_header.

Signed-off-by: default avatarVladimir Oltean <vladimir.oltean@nxp.com>
Reviewed-by: default avatarEric Dumazet <edumazet@google.com>
Reviewed-by: default avatarSimon Horman <simon.horman@corigine.com>
Reviewed-by: default avatarFlorian Fainelli <f.fainelli@gmail.com>
Acked-by: default avatarMadalin Bucur <madalin.bucur@oss.nxp.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 1f5020ac

drivers/net/ethernet/freescale/dpaa/dpaa_eth.c

+2 −7
Original line number Diff line number Diff line
@@ -1482,13 +1482,8 @@ static int dpaa_enable_tx_csum(struct dpaa_priv *priv, 
	parse_result = (struct fman_prs_result *)parse_results;



	/* If we're dealing with VLAN, get the real Ethernet type */

	if (ethertype == ETH_P_8021Q) {

		/* We can't always assume the MAC header is set correctly

		 * by the stack, so reset to beginning of skb->data

		 */

		skb_reset_mac_header(skb);

		ethertype = ntohs(vlan_eth_hdr(skb)->h_vlan_encapsulated_proto);

	}

	if (ethertype == ETH_P_8021Q)

		ethertype = ntohs(skb_vlan_eth_hdr(skb)->h_vlan_encapsulated_proto);



	/* Fill in the relevant L3 parse result fields

	 * and read the L4 protocol type