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

Commit 7c4d16ff authored by Joe Perches's avatar Joe Perches Committed by Jeff Kirsher
Browse files

igb: Convert uses of __constant_<foo> to <foo> 



The use of __constant_<foo> has been unnecessary for quite awhile now.

Make these uses consistent with the rest of the kernel.

Signed-off-by: default avatarJoe Perches <joe@perches.com>
Tested-by: default avatarAaron Brown <aaron.f.brown@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent 3d2372eb

drivers/net/ethernet/intel/igb/igb_main.c

+6 −6
Original line number Original line Diff line number Diff line
@@ -4592,7 +4592,7 @@ static int igb_tso(struct igb_ring *tx_ring, 
	/* ADV DTYP TUCMD MKRLOC/ISCSIHEDLEN */

	/* ADV DTYP TUCMD MKRLOC/ISCSIHEDLEN */

	type_tucmd = E1000_ADVTXD_TUCMD_L4T_TCP;

	type_tucmd = E1000_ADVTXD_TUCMD_L4T_TCP;





	if (first->protocol == __constant_htons(ETH_P_IP)) {

	if (first->protocol == htons(ETH_P_IP)) {

		struct iphdr *iph = ip_hdr(skb);

		struct iphdr *iph = ip_hdr(skb);

		iph->tot_len = 0;

		iph->tot_len = 0;

		iph->check = 0;

		iph->check = 0;
@@ -4648,12 +4648,12 @@ static void igb_tx_csum(struct igb_ring *tx_ring, struct igb_tx_buffer *first) 
	} else {

	} else {

		u8 l4_hdr = 0;

		u8 l4_hdr = 0;

		switch (first->protocol) {

		switch (first->protocol) {

		case __constant_htons(ETH_P_IP):

		case htons(ETH_P_IP):

			vlan_macip_lens |= skb_network_header_len(skb);

			vlan_macip_lens |= skb_network_header_len(skb);

			type_tucmd |= E1000_ADVTXD_TUCMD_IPV4;

			type_tucmd |= E1000_ADVTXD_TUCMD_IPV4;

			l4_hdr = ip_hdr(skb)->protocol;

			l4_hdr = ip_hdr(skb)->protocol;

			break;

			break;

		case __constant_htons(ETH_P_IPV6):

		case htons(ETH_P_IPV6):

			vlan_macip_lens |= skb_network_header_len(skb);

			vlan_macip_lens |= skb_network_header_len(skb);

			l4_hdr = ipv6_hdr(skb)->nexthdr;

			l4_hdr = ipv6_hdr(skb)->nexthdr;

			break;

			break;
@@ -6738,7 +6738,7 @@ static unsigned int igb_get_headlen(unsigned char *data, 
	hdr.network += ETH_HLEN;

	hdr.network += ETH_HLEN;





	/* handle any vlan tag if present */

	/* handle any vlan tag if present */

	if (protocol == __constant_htons(ETH_P_8021Q)) {

	if (protocol == htons(ETH_P_8021Q)) {

		if ((hdr.network - data) > (max_len - VLAN_HLEN))

		if ((hdr.network - data) > (max_len - VLAN_HLEN))

			return max_len;

			return max_len;
@@ -6747,7 +6747,7 @@ static unsigned int igb_get_headlen(unsigned char *data, 
	}

	}





	/* handle L3 protocols */

	/* handle L3 protocols */

	if (protocol == __constant_htons(ETH_P_IP)) {

	if (protocol == htons(ETH_P_IP)) {

		if ((hdr.network - data) > (max_len - sizeof(struct iphdr)))

		if ((hdr.network - data) > (max_len - sizeof(struct iphdr)))

			return max_len;

			return max_len;
@@ -6761,7 +6761,7 @@ static unsigned int igb_get_headlen(unsigned char *data, 
		/* record next protocol if header is present */

		/* record next protocol if header is present */

		if (!(hdr.ipv4->frag_off & htons(IP_OFFSET)))

		if (!(hdr.ipv4->frag_off & htons(IP_OFFSET)))

			nexthdr = hdr.ipv4->protocol;

			nexthdr = hdr.ipv4->protocol;

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

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

		if ((hdr.network - data) > (max_len - sizeof(struct ipv6hdr)))

		if ((hdr.network - data) > (max_len - sizeof(struct ipv6hdr)))

			return max_len;

			return max_len;