Messages in this thread Patch in this message |  | | From | YueHaibing <> | Subject | [PATCH net-next] bnxt_en: Properly get address type of encapsulation IP headers | Date | Sat, 1 Sep 2018 17:25:29 +0800 |
| |
gcc '-Wunused-but-set-variable' warning:
drivers/net/ethernet/broadcom/bnxt/bnxt_tc.c: In function 'bnxt_tc_parse_flow': drivers/net/ethernet/broadcom/bnxt/bnxt_tc.c:186:6: warning: variable 'addr_type' set but not used [-Wunused-but-set-variable]
As done elsewhere in TC/flower offload code, the address type of the encapsulation IP headers should be realized accroding to the addr_type field of the encapsulation control dissector key.
Fixes: 8c95f773b4a3 ("bnxt_en: add support for Flower based vxlan encap/decap offload") Fixes: 2ae7408fedfe ("bnxt_en: bnxt: add TC flower filter offload support") Signed-off-by: YueHaibing <yuehaibing@huawei.com> --- drivers/net/ethernet/broadcom/bnxt/bnxt_tc.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-)
diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt_tc.c b/drivers/net/ethernet/broadcom/bnxt/bnxt_tc.c index 092c817..5c625e5 100644 --- a/drivers/net/ethernet/broadcom/bnxt/bnxt_tc.c +++ b/drivers/net/ethernet/broadcom/bnxt/bnxt_tc.c @@ -242,7 +242,7 @@ static int bnxt_tc_parse_flow(struct bnxt *bp, flow->l2_key.num_vlans = 1; } - if (dissector_uses_key(dissector, FLOW_DISSECTOR_KEY_IPV4_ADDRS)) { + if (addr_type == FLOW_DISSECTOR_KEY_IPV4_ADDRS) { struct flow_dissector_key_ipv4_addrs *key = GET_KEY(tc_flow_cmd, FLOW_DISSECTOR_KEY_IPV4_ADDRS); struct flow_dissector_key_ipv4_addrs *mask = @@ -253,8 +253,7 @@ static int bnxt_tc_parse_flow(struct bnxt *bp, flow->l3_mask.ipv4.daddr.s_addr = mask->dst; flow->l3_key.ipv4.saddr.s_addr = key->src; flow->l3_mask.ipv4.saddr.s_addr = mask->src; - } else if (dissector_uses_key(dissector, - FLOW_DISSECTOR_KEY_IPV6_ADDRS)) { + } else if (addr_type == FLOW_DISSECTOR_KEY_IPV6_ADDRS) { struct flow_dissector_key_ipv6_addrs *key = GET_KEY(tc_flow_cmd, FLOW_DISSECTOR_KEY_IPV6_ADDRS); struct flow_dissector_key_ipv6_addrs *mask = @@ -300,7 +299,7 @@ static int bnxt_tc_parse_flow(struct bnxt *bp, addr_type = key->addr_type; } - if (dissector_uses_key(dissector, FLOW_DISSECTOR_KEY_ENC_IPV4_ADDRS)) { + if (addr_type == FLOW_DISSECTOR_KEY_ENC_IPV4_ADDRS) { struct flow_dissector_key_ipv4_addrs *key = GET_KEY(tc_flow_cmd, FLOW_DISSECTOR_KEY_ENC_IPV4_ADDRS); struct flow_dissector_key_ipv4_addrs *mask = @@ -312,8 +311,7 @@ static int bnxt_tc_parse_flow(struct bnxt *bp, flow->tun_mask.u.ipv4.dst = mask->dst; flow->tun_key.u.ipv4.src = key->src; flow->tun_mask.u.ipv4.src = mask->src; - } else if (dissector_uses_key(dissector, - FLOW_DISSECTOR_KEY_ENC_IPV6_ADDRS)) { + } else if (addr_type == FLOW_DISSECTOR_KEY_ENC_IPV6_ADDRS) { return -EOPNOTSUPP; } -- 2.7.0
|  |