1 files changed, 8 insertions, 8 deletions

diff --git a/drivers/net/wan/hdlc_fr.c b/drivers/net/wan/hdlc_fr.c
index 70e57cebc955..800530101093 100644
--- a/drivers/net/wan/hdlc_fr.c
+++ b/drivers/net/wan/hdlc_fr.c
@@ -278,31 +278,31 @@ static int fr_hard_header(struct sk_buff **skb_p, u16 dlci)
         struct sk_buff *skb = *skb_p;
 
         switch (skb->protocol) {
-        case __constant_htons(NLPID_CCITT_ANSI_LMI):
+        case cpu_to_be16(NLPID_CCITT_ANSI_LMI):
                 head_len = 4;
                 skb_push(skb, head_len);
                 skb->data[3] = NLPID_CCITT_ANSI_LMI;
                 break;
 
-        case __constant_htons(NLPID_CISCO_LMI):
+        case cpu_to_be16(NLPID_CISCO_LMI):
                 head_len = 4;
                 skb_push(skb, head_len);
                 skb->data[3] = NLPID_CISCO_LMI;
                 break;
 
-        case __constant_htons(ETH_P_IP):
+        case cpu_to_be16(ETH_P_IP):
                 head_len = 4;
                 skb_push(skb, head_len);
                 skb->data[3] = NLPID_IP;
                 break;
 
-        case __constant_htons(ETH_P_IPV6):
+        case cpu_to_be16(ETH_P_IPV6):
                 head_len = 4;
                 skb_push(skb, head_len);
                 skb->data[3] = NLPID_IPV6;
                 break;
 
-        case __constant_htons(ETH_P_802_3):
+        case cpu_to_be16(ETH_P_802_3):
                 head_len = 10;
                 if (skb_headroom(skb) < head_len) {
                         struct sk_buff *skb2 = skb_realloc_headroom(skb,
@@ -426,7 +426,7 @@ static int pvc_xmit(struct sk_buff *skb, struct net_device *dev)
                                 skb_put(skb, pad);
                                 memset(skb->data + len, 0, pad);
                         }
-                        skb->protocol = __constant_htons(ETH_P_802_3);
+                        skb->protocol = cpu_to_be16(ETH_P_802_3);
                 }
                 if (!fr_hard_header(&skb, pvc->dlci)) {
                         dev->stats.tx_bytes += skb->len;
@@ -496,10 +496,10 @@ static void fr_lmi_send(struct net_device *dev, int fullrep)
         memset(skb->data, 0, len);
         skb_reserve(skb, 4);
         if (lmi == LMI_CISCO) {
-                skb->protocol = __constant_htons(NLPID_CISCO_LMI);
+                skb->protocol = cpu_to_be16(NLPID_CISCO_LMI);
                 fr_hard_header(&skb, LMI_CISCO_DLCI);
         } else {
-                skb->protocol = __constant_htons(NLPID_CCITT_ANSI_LMI);
+                skb->protocol = cpu_to_be16(NLPID_CCITT_ANSI_LMI);
                 fr_hard_header(&skb, LMI_CCITT_ANSI_DLCI);
         }
         data = skb_tail_pointer(skb);