3 files changed, 8 insertions, 8 deletions

diff --git a/include/net/llc_pdu.h b/include/net/llc_pdu.h
index 8f6306581fa7..aa33a477c3fb 100644
--- a/include/net/llc_pdu.h
+++ b/include/net/llc_pdu.h
@@ -252,9 +252,9 @@ static inline void llc_pdu_header_init(struct sk_buff *skb, u8 type,
  */
 static inline void llc_pdu_decode_sa(struct sk_buff *skb, u8 *sa)
 {
-        if (skb->protocol == ntohs(ETH_P_802_2))
+        if (skb->protocol == htons(ETH_P_802_2))
                 memcpy(sa, eth_hdr(skb)->h_source, ETH_ALEN);
-        else if (skb->protocol == ntohs(ETH_P_TR_802_2)) {
+        else if (skb->protocol == htons(ETH_P_TR_802_2)) {
                 memcpy(sa, tr_hdr(skb)->saddr, ETH_ALEN);
                 *sa &= 0x7F;
         }
@@ -269,9 +269,9 @@ static inline void llc_pdu_decode_sa(struct sk_buff *skb, u8 *sa)
  */
 static inline void llc_pdu_decode_da(struct sk_buff *skb, u8 *da)
 {
-        if (skb->protocol == ntohs(ETH_P_802_2))
+        if (skb->protocol == htons(ETH_P_802_2))
                 memcpy(da, eth_hdr(skb)->h_dest, ETH_ALEN);
-        else if (skb->protocol == ntohs(ETH_P_TR_802_2))
+        else if (skb->protocol == htons(ETH_P_TR_802_2))
                 memcpy(da, tr_hdr(skb)->daddr, ETH_ALEN);
 }
 
@@ -345,7 +345,7 @@ static inline void llc_pdu_init_as_test_rsp(struct sk_buff *skb,
         pdu->ctrl_1  = LLC_PDU_TYPE_U;
         pdu->ctrl_1 |= LLC_1_PDU_CMD_TEST;
         pdu->ctrl_1 |= LLC_U_PF_BIT_MASK;
-        if (ev_skb->protocol == ntohs(ETH_P_802_2)) {
+        if (ev_skb->protocol == htons(ETH_P_802_2)) {
                 struct llc_pdu_un *ev_pdu = llc_pdu_un_hdr(ev_skb);
                 int dsize;
 
diff --git a/net/llc/af_llc.c b/net/llc/af_llc.c
index 2652ead96c64..190bb3e05188 100644
--- a/net/llc/af_llc.c
+++ b/net/llc/af_llc.c
@@ -64,7 +64,7 @@ static inline u16 llc_ui_next_link_no(int sap)
  *
  *      Given an ARP header type return the corresponding ethernet protocol.
  */
-static inline u16 llc_proto_type(u16 arphrd)
+static inline __be16 llc_proto_type(u16 arphrd)
 {
         return arphrd == ARPHRD_IEEE802_TR ?
                          htons(ETH_P_TR_802_2) : htons(ETH_P_802_2);
diff --git a/net/llc/llc_input.c b/net/llc/llc_input.c
index 94d2368ade92..db82aff6e40f 100644
--- a/net/llc/llc_input.c
+++ b/net/llc/llc_input.c
@@ -115,8 +115,8 @@ static inline int llc_fixup_skb(struct sk_buff *skb)
         skb->h.raw += llc_len;
         skb_pull(skb, llc_len);
         if (skb->protocol == htons(ETH_P_802_2)) {
-                u16 pdulen = eth_hdr(skb)->h_proto,
-                    data_size = ntohs(pdulen) - llc_len;
+                __be16 pdulen = eth_hdr(skb)->h_proto;
+                u16 data_size = ntohs(pdulen) - llc_len;
 
                 if (unlikely(pskb_trim_rcsum(skb, data_size)))
                         return 0;