diff options
author | Harvey Harrison <harvey.harrison@gmail.com> | 2009-02-01 03:45:17 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-02-01 03:45:17 -0500 |
commit | 09640e6365c679b5642b1c41b6d7078f51689ddf (patch) | |
tree | a2b80c153bd23fe59db8c6994fda29923819fcea /drivers/net/netxen | |
parent | ee437770c42088b9b653e8b3bf28a61fa647f84e (diff) |
net: replace uses of __constant_{endian}
Base versions handle constant folding now.
Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/netxen')
-rw-r--r-- | drivers/net/netxen/netxen_nic_main.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/net/netxen/netxen_nic_main.c b/drivers/net/netxen/netxen_nic_main.c index cc06cc5429f..ada462e94c9 100644 --- a/drivers/net/netxen/netxen_nic_main.c +++ b/drivers/net/netxen/netxen_nic_main.c | |||
@@ -1170,7 +1170,7 @@ static bool netxen_tso_check(struct net_device *netdev, | |||
1170 | __be16 protocol = skb->protocol; | 1170 | __be16 protocol = skb->protocol; |
1171 | u16 flags = 0; | 1171 | u16 flags = 0; |
1172 | 1172 | ||
1173 | if (protocol == __constant_htons(ETH_P_8021Q)) { | 1173 | if (protocol == cpu_to_be16(ETH_P_8021Q)) { |
1174 | struct vlan_ethhdr *vh = (struct vlan_ethhdr *)skb->data; | 1174 | struct vlan_ethhdr *vh = (struct vlan_ethhdr *)skb->data; |
1175 | protocol = vh->h_vlan_encapsulated_proto; | 1175 | protocol = vh->h_vlan_encapsulated_proto; |
1176 | flags = FLAGS_VLAN_TAGGED; | 1176 | flags = FLAGS_VLAN_TAGGED; |
@@ -1183,21 +1183,21 @@ static bool netxen_tso_check(struct net_device *netdev, | |||
1183 | desc->total_hdr_length = | 1183 | desc->total_hdr_length = |
1184 | skb_transport_offset(skb) + tcp_hdrlen(skb); | 1184 | skb_transport_offset(skb) + tcp_hdrlen(skb); |
1185 | 1185 | ||
1186 | opcode = (protocol == __constant_htons(ETH_P_IPV6)) ? | 1186 | opcode = (protocol == cpu_to_be16(ETH_P_IPV6)) ? |
1187 | TX_TCP_LSO6 : TX_TCP_LSO; | 1187 | TX_TCP_LSO6 : TX_TCP_LSO; |
1188 | tso = true; | 1188 | tso = true; |
1189 | 1189 | ||
1190 | } else if (skb->ip_summed == CHECKSUM_PARTIAL) { | 1190 | } else if (skb->ip_summed == CHECKSUM_PARTIAL) { |
1191 | u8 l4proto; | 1191 | u8 l4proto; |
1192 | 1192 | ||
1193 | if (protocol == __constant_htons(ETH_P_IP)) { | 1193 | if (protocol == cpu_to_be16(ETH_P_IP)) { |
1194 | l4proto = ip_hdr(skb)->protocol; | 1194 | l4proto = ip_hdr(skb)->protocol; |
1195 | 1195 | ||
1196 | if (l4proto == IPPROTO_TCP) | 1196 | if (l4proto == IPPROTO_TCP) |
1197 | opcode = TX_TCP_PKT; | 1197 | opcode = TX_TCP_PKT; |
1198 | else if(l4proto == IPPROTO_UDP) | 1198 | else if(l4proto == IPPROTO_UDP) |
1199 | opcode = TX_UDP_PKT; | 1199 | opcode = TX_UDP_PKT; |
1200 | } else if (protocol == __constant_htons(ETH_P_IPV6)) { | 1200 | } else if (protocol == cpu_to_be16(ETH_P_IPV6)) { |
1201 | l4proto = ipv6_hdr(skb)->nexthdr; | 1201 | l4proto = ipv6_hdr(skb)->nexthdr; |
1202 | 1202 | ||
1203 | if (l4proto == IPPROTO_TCP) | 1203 | if (l4proto == IPPROTO_TCP) |