net: bcmgenet: Fix sparse warnings in bcmgenet_put_tx_csum()

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: 1c1008c793fa ("net: bcmgenet: add main driver file")
Signed-off-by: Florian Fainelli <[email protected]>
Signed-off-by: David S. Miller <[email protected]>

diff --git a/drivers/net/ethernet/broadcom/genet/bcmgenet.c b/drivers/net/ethernet/broadcom/genet/bcmgenet.c
index 264fb37dd341dd1ec76b071a2ff25c9ea1255ee8..0445f2c0c6295bbeb9242c3375960b04dab94dbb 100644 (file)
--- 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;
        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))) {
        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) {
        status = (struct status_64 *)skb->data;
 
        if (skb->ip_summed  == CHECKSUM_PARTIAL) {

-               ip_ver = htons(skb->protocol);
+               ip_ver = skb->protocol;

                switch (ip_ver) {
                switch (ip_ver) {

-               case ETH_P_IP:
+               case htons(ETH_P_IP):

                        ip_proto = ip_hdr(skb)->protocol;
                        break;
                        ip_proto = ip_hdr(skb)->protocol;
                        break;

-               case ETH_P_IPV6:
+               case htons(ETH_P_IPV6):

                        ip_proto = ipv6_hdr(skb)->nexthdr;
                        break;
                default:
                        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_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;
                                tx_csum_info |= STATUS_TX_CSUM_PROTO_UDP;
                } else {
                        tx_csum_info = 0;