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/pppoe.c | |
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/pppoe.c')
-rw-r--r-- | drivers/net/pppoe.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/net/pppoe.c b/drivers/net/pppoe.c index 074803a78fc6..1011fd64108b 100644 --- a/drivers/net/pppoe.c +++ b/drivers/net/pppoe.c | |||
@@ -514,12 +514,12 @@ out: | |||
514 | } | 514 | } |
515 | 515 | ||
516 | static struct packet_type pppoes_ptype = { | 516 | static struct packet_type pppoes_ptype = { |
517 | .type = __constant_htons(ETH_P_PPP_SES), | 517 | .type = cpu_to_be16(ETH_P_PPP_SES), |
518 | .func = pppoe_rcv, | 518 | .func = pppoe_rcv, |
519 | }; | 519 | }; |
520 | 520 | ||
521 | static struct packet_type pppoed_ptype = { | 521 | static struct packet_type pppoed_ptype = { |
522 | .type = __constant_htons(ETH_P_PPP_DISC), | 522 | .type = cpu_to_be16(ETH_P_PPP_DISC), |
523 | .func = pppoe_disc_rcv, | 523 | .func = pppoe_disc_rcv, |
524 | }; | 524 | }; |
525 | 525 | ||
@@ -877,7 +877,7 @@ static int pppoe_sendmsg(struct kiocb *iocb, struct socket *sock, | |||
877 | skb->dev = dev; | 877 | skb->dev = dev; |
878 | 878 | ||
879 | skb->priority = sk->sk_priority; | 879 | skb->priority = sk->sk_priority; |
880 | skb->protocol = __constant_htons(ETH_P_PPP_SES); | 880 | skb->protocol = cpu_to_be16(ETH_P_PPP_SES); |
881 | 881 | ||
882 | ph = (struct pppoe_hdr *)skb_put(skb, total_len + sizeof(struct pppoe_hdr)); | 882 | ph = (struct pppoe_hdr *)skb_put(skb, total_len + sizeof(struct pppoe_hdr)); |
883 | start = (char *)&ph->tag[0]; | 883 | start = (char *)&ph->tag[0]; |
@@ -937,7 +937,7 @@ static int __pppoe_xmit(struct sock *sk, struct sk_buff *skb) | |||
937 | ph->sid = po->num; | 937 | ph->sid = po->num; |
938 | ph->length = htons(data_len); | 938 | ph->length = htons(data_len); |
939 | 939 | ||
940 | skb->protocol = __constant_htons(ETH_P_PPP_SES); | 940 | skb->protocol = cpu_to_be16(ETH_P_PPP_SES); |
941 | skb->dev = dev; | 941 | skb->dev = dev; |
942 | 942 | ||
943 | dev_hard_header(skb, dev, ETH_P_PPP_SES, | 943 | dev_hard_header(skb, dev, ETH_P_PPP_SES, |