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

Commit 0e2fe46c authored by Jesse Brandeburg's avatar Jesse Brandeburg Committed by Jeff Kirsher
Browse files

i40e: fix constant cast issues 



replace __constant_htons with htons

Change-Id: I123a5318bae34c8b004c71db07c56f137c685849
Signed-off-by: default avatarJesse Brandeburg <jesse.brandeburg@intel.com>
Tested-by: default avatarKavindya Deegala <kavindya.s.deegala@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent e5e0a5db

drivers/net/ethernet/intel/i40e/i40e_txrx.c

+4 −4
Original line number Original line Diff line number Diff line
@@ -1317,7 +1317,7 @@ static int i40e_tx_prepare_vlan_flags(struct sk_buff *skb, 
		tx_flags |= vlan_tx_tag_get(skb) << I40E_TX_FLAGS_VLAN_SHIFT;

		tx_flags |= vlan_tx_tag_get(skb) << I40E_TX_FLAGS_VLAN_SHIFT;

		tx_flags |= I40E_TX_FLAGS_HW_VLAN;

		tx_flags |= I40E_TX_FLAGS_HW_VLAN;

	/* else if it is a SW VLAN, check the next protocol and store the tag */

	/* else if it is a SW VLAN, check the next protocol and store the tag */

	} else if (protocol == __constant_htons(ETH_P_8021Q)) {

	} else if (protocol == htons(ETH_P_8021Q)) {

		struct vlan_hdr *vhdr, _vhdr;

		struct vlan_hdr *vhdr, _vhdr;

		vhdr = skb_header_pointer(skb, ETH_HLEN, sizeof(_vhdr), &_vhdr);

		vhdr = skb_header_pointer(skb, ETH_HLEN, sizeof(_vhdr), &_vhdr);

		if (!vhdr)

		if (!vhdr)
@@ -1382,7 +1382,7 @@ static int i40e_tso(struct i40e_ring *tx_ring, struct sk_buff *skb, 
			return err;

			return err;

	}

	}





	if (protocol == __constant_htons(ETH_P_IP)) {

	if (protocol == htons(ETH_P_IP)) {

		iph = skb->encapsulation ? inner_ip_hdr(skb) : ip_hdr(skb);

		iph = skb->encapsulation ? inner_ip_hdr(skb) : ip_hdr(skb);

		tcph = skb->encapsulation ? inner_tcp_hdr(skb) : tcp_hdr(skb);

		tcph = skb->encapsulation ? inner_tcp_hdr(skb) : tcp_hdr(skb);

		iph->tot_len = 0;

		iph->tot_len = 0;
@@ -1805,9 +1805,9 @@ static netdev_tx_t i40e_xmit_frame_ring(struct sk_buff *skb, 
	first = &tx_ring->tx_bi[tx_ring->next_to_use];

	first = &tx_ring->tx_bi[tx_ring->next_to_use];





	/* setup IPv4/IPv6 offloads */

	/* setup IPv4/IPv6 offloads */

	if (protocol == __constant_htons(ETH_P_IP))

	if (protocol == htons(ETH_P_IP))

		tx_flags |= I40E_TX_FLAGS_IPV4;

		tx_flags |= I40E_TX_FLAGS_IPV4;

	else if (protocol == __constant_htons(ETH_P_IPV6))

	else if (protocol == htons(ETH_P_IPV6))

		tx_flags |= I40E_TX_FLAGS_IPV6;

		tx_flags |= I40E_TX_FLAGS_IPV6;





	tso = i40e_tso(tx_ring, skb, tx_flags, protocol, &hdr_len,

	tso = i40e_tso(tx_ring, skb, tx_flags, protocol, &hdr_len,