| From: Florian Fainelli <f.fainelli@gmail.com> |
| Date: Mon, 2 Apr 2018 15:58:56 -0700 |
| Subject: net: systemport: Fix sparse warnings in bcm_sysport_insert_tsb() |
| |
| commit c0eb05585d4184596453622b5abba7d13dd20667 upstream. |
| |
| skb->protocol is a __be16 which we would be calling htons() against, |
| while this is not wrong per-se as it correctly results in swapping the |
| value on LE hosts, this still upsets sparse. Adopt a similar pattern to |
| what other drivers do and just assign ip_ver to skb->protocol, and then |
| use htons() against the different constants such that the compiler can |
| resolve the values at build time. |
| |
| Fixes: 80105befdb4b ("net: systemport: add Broadcom SYSTEMPORT Ethernet MAC driver") |
| Signed-off-by: Florian Fainelli <f.fainelli@gmail.com> |
| Signed-off-by: David S. Miller <davem@davemloft.net> |
| Signed-off-by: Ben Hutchings <ben@decadent.org.uk> |
| --- |
| drivers/net/ethernet/broadcom/bcmsysport.c | 11 ++++++----- |
| 1 file changed, 6 insertions(+), 5 deletions(-) |
| |
| --- a/drivers/net/ethernet/broadcom/bcmsysport.c |
| +++ b/drivers/net/ethernet/broadcom/bcmsysport.c |
| @@ -772,7 +772,7 @@ static struct sk_buff *bcm_sysport_inser |
| 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))) { |
| @@ -791,12 +791,12 @@ static struct sk_buff *bcm_sysport_inser |
| 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: |
| @@ -810,7 +810,8 @@ static struct sk_buff *bcm_sysport_inser |
| |
| 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; |
