i40evf: remove redundant array comparisons to 0 checks

The checks to see if key->dst.s6_addr and key->src.s6_addr are null
pointers are redundant because these are constant size arrays and
so the checks always return true.  Fix this by removing the redundant
checks.   Also replace filter->f with vf, allowing wide lines to be
condensed and to rejoin some split wide lines.

Detected by CoverityScan, CID#1465279 ("Array compared to 0")

Signed-off-by: Colin Ian King <colin.king@canonical.com>
Tested-by: Andrew Bowers <andrewx.bowers@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>

diff --git a/drivers/net/ethernet/intel/i40evf/i40evf_main.c b/drivers/net/ethernet/intel/i40evf/i40evf_main.c
index 4f5744d488aa9f0a3f5d1b155ad559ecd43e18af..dae121877935fa53ee2d399bda2ca80423217567 100644 (file)
--- a/drivers/net/ethernet/intel/i40evf/i40evf_main.c
+++ b/drivers/net/ethernet/intel/i40evf/i40evf_main.c
@@ -2490,6 +2490,7 @@ static int i40evf_parse_cls_flower(struct i40evf_adapter *adapter,
        u16 addr_type = 0;
        u16 n_proto = 0;
        int i = 0;
+       struct virtchnl_filter *vf = &filter->f;
 
        if (f->dissector->used_keys &
            ~(BIT(FLOW_DISSECTOR_KEY_CONTROL) |
@@ -2537,7 +2538,7 @@ static int i40evf_parse_cls_flower(struct i40evf_adapter *adapter,
                        return -EINVAL;
                if (n_proto == ETH_P_IPV6) {
                        /* specify flow type as TCP IPv6 */
-                       filter->f.flow_type = VIRTCHNL_TCP_V6_FLOW;
+                       vf->flow_type = VIRTCHNL_TCP_V6_FLOW;
                }
 
                if (key->ip_proto != IPPROTO_TCP) {
@@ -2582,9 +2583,8 @@ static int i40evf_parse_cls_flower(struct i40evf_adapter *adapter,
                            is_multicast_ether_addr(key->dst)) {
                                /* set the mask if a valid dst_mac address */
                                for (i = 0; i < ETH_ALEN; i++)
-                                       filter->f.mask.tcp_spec.dst_mac[i] |=
-                                                                       0xff;
-                               ether_addr_copy(filter->f.data.tcp_spec.dst_mac,
+                                       vf->mask.tcp_spec.dst_mac[i] |= 0xff;
+                               ether_addr_copy(vf->data.tcp_spec.dst_mac,
                                                key->dst);
                        }
 
@@ -2593,9 +2593,8 @@ static int i40evf_parse_cls_flower(struct i40evf_adapter *adapter,
                            is_multicast_ether_addr(key->src)) {
                                /* set the mask if a valid dst_mac address */
                                for (i = 0; i < ETH_ALEN; i++)
-                                       filter->f.mask.tcp_spec.src_mac[i] |=
-                                                                       0xff;
-                               ether_addr_copy(filter->f.data.tcp_spec.src_mac,
+                                       vf->mask.tcp_spec.src_mac[i] |= 0xff;
+                               ether_addr_copy(vf->data.tcp_spec.src_mac,
                                                key->src);
                }
        }
@@ -2619,8 +2618,8 @@ static int i40evf_parse_cls_flower(struct i40evf_adapter *adapter,
                                return I40E_ERR_CONFIG;
                        }
                }
-               filter->f.mask.tcp_spec.vlan_id |= cpu_to_be16(0xffff);
-               filter->f.data.tcp_spec.vlan_id = cpu_to_be16(key->vlan_id);
+               vf->mask.tcp_spec.vlan_id |= cpu_to_be16(0xffff);
+               vf->data.tcp_spec.vlan_id = cpu_to_be16(key->vlan_id);
        }
 
        if (dissector_uses_key(f->dissector, FLOW_DISSECTOR_KEY_CONTROL)) {
@@ -2667,14 +2666,12 @@ static int i40evf_parse_cls_flower(struct i40evf_adapter *adapter,
                        return I40E_ERR_CONFIG;
                }
                if (key->dst) {
-                       filter->f.mask.tcp_spec.dst_ip[0] |=
-                                                       cpu_to_be32(0xffffffff);
-                       filter->f.data.tcp_spec.dst_ip[0] = key->dst;
+                       vf->mask.tcp_spec.dst_ip[0] |= cpu_to_be32(0xffffffff);
+                       vf->data.tcp_spec.dst_ip[0] = key->dst;
                }
                if (key->src) {
-                       filter->f.mask.tcp_spec.src_ip[0] |=
-                                                       cpu_to_be32(0xffffffff);
-                       filter->f.data.tcp_spec.src_ip[0] = key->src;
+                       vf->mask.tcp_spec.src_ip[0] |= cpu_to_be32(0xffffffff);
+                       vf->data.tcp_spec.src_ip[0] = key->src;
                }
        }
 
@@ -2707,22 +2704,14 @@ static int i40evf_parse_cls_flower(struct i40evf_adapter *adapter,
                if (!ipv6_addr_any(&mask->dst) || !ipv6_addr_any(&mask->src))
                        field_flags |= I40EVF_CLOUD_FIELD_IIP;
 
-               if (key->dst.s6_addr) {
-                       for (i = 0; i < 4; i++)
-                               filter->f.mask.tcp_spec.dst_ip[i] |=
-                                                       cpu_to_be32(0xffffffff);
-                       memcpy(&filter->f.data.tcp_spec.dst_ip,
-                              &key->dst.s6_addr32,
-                              sizeof(filter->f.data.tcp_spec.dst_ip));
-               }
-               if (key->src.s6_addr) {
-                       for (i = 0; i < 4; i++)
-                               filter->f.mask.tcp_spec.src_ip[i] |=
-                                                       cpu_to_be32(0xffffffff);
-                       memcpy(&filter->f.data.tcp_spec.src_ip,
-                              &key->src.s6_addr32,
-                              sizeof(filter->f.data.tcp_spec.src_ip));
-               }
+               for (i = 0; i < 4; i++)
+                       vf->mask.tcp_spec.dst_ip[i] |= cpu_to_be32(0xffffffff);
+               memcpy(&vf->data.tcp_spec.dst_ip, &key->dst.s6_addr32,
+                      sizeof(vf->data.tcp_spec.dst_ip));
+               for (i = 0; i < 4; i++)
+                       vf->mask.tcp_spec.src_ip[i] |= cpu_to_be32(0xffffffff);
+               memcpy(&vf->data.tcp_spec.src_ip, &key->src.s6_addr32,
+                      sizeof(vf->data.tcp_spec.src_ip));
        }
        if (dissector_uses_key(f->dissector, FLOW_DISSECTOR_KEY_PORTS)) {
                struct flow_dissector_key_ports *key =
@@ -2754,16 +2743,16 @@ static int i40evf_parse_cls_flower(struct i40evf_adapter *adapter,
                        }
                }
                if (key->dst) {
-                       filter->f.mask.tcp_spec.dst_port |= cpu_to_be16(0xffff);
-                       filter->f.data.tcp_spec.dst_port = key->dst;
+                       vf->mask.tcp_spec.dst_port |= cpu_to_be16(0xffff);
+                       vf->data.tcp_spec.dst_port = key->dst;
                }
 
                if (key->src) {
-                       filter->f.mask.tcp_spec.src_port |= cpu_to_be16(0xffff);
-                       filter->f.data.tcp_spec.src_port = key->dst;
+                       vf->mask.tcp_spec.src_port |= cpu_to_be16(0xffff);
+                       vf->data.tcp_spec.src_port = key->dst;
                }
        }
-       filter->f.field_flags = field_flags;
+       vf->field_flags = field_flags;
 
        return 0;
 }