aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoe Perches <joe@perches.com>2014-03-13 01:19:30 -0400
committerJeff Kirsher <jeffrey.t.kirsher@intel.com>2014-03-20 01:54:22 -0400
commit0933ce4a9d68ae35dccfa592fa361c149df5d1af (patch)
tree9311e86b28b20724de770d84e0fca340d603ae6d
parenta1108ffd18c6e4f09b2d45b5ee151b10d52af4da (diff)
ixgbevf: 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: Joe Perches <joe@perches.com> Tested-by: Phil Schmitt <phillip.j.schmitt@intel.com> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
-rw-r--r--drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c b/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c
index a2cba53c31be..592d8a6baabc 100644
--- a/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c
+++ b/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c
@@ -2857,12 +2857,12 @@ static void ixgbevf_tx_csum(struct ixgbevf_ring *tx_ring,
2857 if (skb->ip_summed == CHECKSUM_PARTIAL) { 2857 if (skb->ip_summed == CHECKSUM_PARTIAL) {
2858 u8 l4_hdr = 0; 2858 u8 l4_hdr = 0;
2859 switch (skb->protocol) { 2859 switch (skb->protocol) {
2860 case __constant_htons(ETH_P_IP): 2860 case htons(ETH_P_IP):
2861 vlan_macip_lens |= skb_network_header_len(skb); 2861 vlan_macip_lens |= skb_network_header_len(skb);
2862 type_tucmd |= IXGBE_ADVTXD_TUCMD_IPV4; 2862 type_tucmd |= IXGBE_ADVTXD_TUCMD_IPV4;
2863 l4_hdr = ip_hdr(skb)->protocol; 2863 l4_hdr = ip_hdr(skb)->protocol;
2864 break; 2864 break;
2865 case __constant_htons(ETH_P_IPV6): 2865 case htons(ETH_P_IPV6):
2866 vlan_macip_lens |= skb_network_header_len(skb); 2866 vlan_macip_lens |= skb_network_header_len(skb);
2867 l4_hdr = ipv6_hdr(skb)->nexthdr; 2867 l4_hdr = ipv6_hdr(skb)->nexthdr;
2868 break; 2868 break;