openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

xilinx: 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>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Joe Perches 2014-03-12 10:22:36 -07:00 committed by David S. Miller
parent b779d0afcc
commit ceffc4acfc
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/net/ethernet/xilinx/ll_temac_main.c
View File

@ -771,8 +771,8 @@ static void ll_temac_recv(struct net_device *ndev)
/* if we're doing rx csum offload, set it up */ /* if we're doing rx csum offload, set it up */
if (((lp->temac_features & TEMAC_FEATURE_RX_CSUM) != 0) && if (((lp->temac_features & TEMAC_FEATURE_RX_CSUM) != 0) &&
(skb->protocol == __constant_htons(ETH_P_IP)) && (skb->protocol == htons(ETH_P_IP)) &&
(skb->len > 64)) { (skb->len > 64)) {
skb->csum = cur_p->app3 & 0xFFFF; skb->csum = cur_p->app3 & 0xFFFF;
skb->ip_summed = CHECKSUM_COMPLETE; skb->ip_summed = CHECKSUM_COMPLETE;

2
drivers/net/ethernet/xilinx/xilinx_axienet_main.c
View File

@ -756,7 +756,7 @@ static void axienet_recv(struct net_device *ndev)
skb->ip_summed = CHECKSUM_UNNECESSARY; skb->ip_summed = CHECKSUM_UNNECESSARY;
} }
} else if ((lp->features & XAE_FEATURE_PARTIAL_RX_CSUM) != 0 && } else if ((lp->features & XAE_FEATURE_PARTIAL_RX_CSUM) != 0 &&
skb->protocol == __constant_htons(ETH_P_IP) && skb->protocol == htons(ETH_P_IP) &&
skb->len > 64) { skb->len > 64) {
skb->csum = be32_to_cpu(cur_p->app3 & 0xFFFF); skb->csum = be32_to_cpu(cur_p->app3 & 0xFFFF);
skb->ip_summed = CHECKSUM_COMPLETE; skb->ip_summed = CHECKSUM_COMPLETE;