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

Commit ceffc4ac authored Mar 12, 2014 by Joe Perches Committed by David S. Miller Mar 12, 2014

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>

parent b779d0af

drivers/net/ethernet/xilinx/ll_temac_main.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -771,7 +771,7 @@ static void ll_temac_recv(struct net_device *ndev)

		/* if we're doing rx csum offload, set it up */
		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->csum = cur_p->app3 & 0xFFFF;

drivers/net/ethernet/xilinx/xilinx_axienet_main.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -756,7 +756,7 @@ static void axienet_recv(struct net_device *ndev)
		skb->ip_summed = CHECKSUM_UNNECESSARY;
		}
		} 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->csum = be32_to_cpu(cur_p->app3 & 0xFFFF);
		skb->ip_summed = CHECKSUM_COMPLETE;