2 files changed, 12 insertions, 10 deletions

diff --git a/drivers/net/ethernet/broadcom/bcmsysport.c b/drivers/net/ethernet/broadcom/bcmsysport.c
index 4a75b1de22e0..f9a3c1a76d5d 100644
--- a/drivers/net/ethernet/broadcom/bcmsysport.c
+++ b/drivers/net/ethernet/broadcom/bcmsysport.c
@@ -1192,7 +1192,7 @@ static struct sk_buff *bcm_sysport_insert_tsb(struct sk_buff *skb,
         u32 csum_info;
         u8 ip_proto;
         u16 csum_start;
-        u16 ip_ver;
+        __be16 ip_ver;
 
         /* Re-allocate SKB if needed */
         if (unlikely(skb_headroom(skb) < sizeof(*tsb))) {
@@ -1211,12 +1211,12 @@ static struct sk_buff *bcm_sysport_insert_tsb(struct sk_buff *skb,
         memset(tsb, 0, sizeof(*tsb));
 
         if (skb->ip_summed == CHECKSUM_PARTIAL) {
-                ip_ver = htons(skb->protocol);
+                ip_ver = skb->protocol;
                 switch (ip_ver) {
-                case ETH_P_IP:
+                case htons(ETH_P_IP):
                         ip_proto = ip_hdr(skb)->protocol;
                         break;
-                case ETH_P_IPV6:
+                case htons(ETH_P_IPV6):
                         ip_proto = ipv6_hdr(skb)->nexthdr;
                         break;
                 default:
@@ -1230,7 +1230,8 @@ static struct sk_buff *bcm_sysport_insert_tsb(struct sk_buff *skb,
 
                 if (ip_proto == IPPROTO_TCP || ip_proto == IPPROTO_UDP) {
                         csum_info |= L4_LENGTH_VALID;
-                        if (ip_proto == IPPROTO_UDP && ip_ver == ETH_P_IP)
+                        if (ip_proto == IPPROTO_UDP &&
+                            ip_ver == htons(ETH_P_IP))
                                 csum_info |= L4_UDP;
                 } else {
                         csum_info = 0;
diff --git a/drivers/net/ethernet/broadcom/genet/bcmgenet.c b/drivers/net/ethernet/broadcom/genet/bcmgenet.c
index 264fb37dd341..0445f2c0c629 100644
--- a/drivers/net/ethernet/broadcom/genet/bcmgenet.c
+++ b/drivers/net/ethernet/broadcom/genet/bcmgenet.c
@@ -1489,7 +1489,7 @@ static struct sk_buff *bcmgenet_put_tx_csum(struct net_device *dev,
         struct sk_buff *new_skb;
         u16 offset;
         u8 ip_proto;
-        u16 ip_ver;
+        __be16 ip_ver;
         u32 tx_csum_info;
 
         if (unlikely(skb_headroom(skb) < sizeof(*status))) {
@@ -1509,12 +1509,12 @@ static struct sk_buff *bcmgenet_put_tx_csum(struct net_device *dev,
         status = (struct status_64 *)skb->data;
 
         if (skb->ip_summed  == CHECKSUM_PARTIAL) {
-                ip_ver = htons(skb->protocol);
+                ip_ver = skb->protocol;
                 switch (ip_ver) {
-                case ETH_P_IP:
+                case htons(ETH_P_IP):
                         ip_proto = ip_hdr(skb)->protocol;
                         break;
-                case ETH_P_IPV6:
+                case htons(ETH_P_IPV6):
                         ip_proto = ipv6_hdr(skb)->nexthdr;
                         break;
                 default:
@@ -1530,7 +1530,8 @@ static struct sk_buff *bcmgenet_put_tx_csum(struct net_device *dev,
                  */
                 if (ip_proto == IPPROTO_TCP || ip_proto == IPPROTO_UDP) {
                         tx_csum_info |= STATUS_TX_CSUM_LV;
-                        if (ip_proto == IPPROTO_UDP && ip_ver == ETH_P_IP)
+                        if (ip_proto == IPPROTO_UDP &&
+                            ip_ver == htons(ETH_P_IP))
                                 tx_csum_info |= STATUS_TX_CSUM_PROTO_UDP;
                 } else {
                         tx_csum_info = 0;