On 07/03/2022 15:05, Nikolay Aleksandrov wrote:
> On 07/03/2022 14:57, Dan Carpenter wrote:
>> The previous check handled the "if (!nh)" condition so we know "nh"
>> is non-NULL here. Delete the check and pull the code in one tab.
>>
>> Signed-off-by: Dan Carpenter <dan.carpenter@xxxxxxxxxx>
>> ---
>> This not a bug so a Fixes tag is innappropriate, however for reviewers
>> this was introduced in commit 4095e0e1328a ("drivers: vxlan: vnifilter:
>> per vni stats")
>
> No, it was not introduced by that commit.
> It was introduced by commit:
> 1274e1cc4226 ("vxlan: ecmp support for mac fdb entries")
>
Forgot to add: patch looks good to me. :)
Reviewed-by: Nikolay Aleksandrov <razor@xxxxxxxxxxxxx>
Thanks,
Nik
>> ---
>> drivers/net/vxlan/vxlan_core.c | 54 ++++++++++++++++------------------
>> 1 file changed, 26 insertions(+), 28 deletions(-)
>>
>> diff --git a/drivers/net/vxlan/vxlan_core.c b/drivers/net/vxlan/vxlan_core.c
>> index 4ab09dd5a32a..795f438940ee 100644
>> --- a/drivers/net/vxlan/vxlan_core.c
>> +++ b/drivers/net/vxlan/vxlan_core.c
>> @@ -811,37 +811,35 @@ static int vxlan_fdb_nh_update(struct vxlan_dev *vxlan, struct vxlan_fdb *fdb,
>> goto err_inval;
>> }
>>
>> - if (nh) {
>> - if (!nexthop_get(nh)) {
>> - NL_SET_ERR_MSG(extack, "Nexthop has been deleted");
>> - nh = NULL;
>> - goto err_inval;
>> - }
>> - if (!nexthop_is_fdb(nh)) {
>> - NL_SET_ERR_MSG(extack, "Nexthop is not a fdb nexthop");
>> - goto err_inval;
>> - }
>> + if (!nexthop_get(nh)) {
>> + NL_SET_ERR_MSG(extack, "Nexthop has been deleted");
>> + nh = NULL;
>> + goto err_inval;
>> + }
>> + if (!nexthop_is_fdb(nh)) {
>> + NL_SET_ERR_MSG(extack, "Nexthop is not a fdb nexthop");
>> + goto err_inval;
>> + }
>>
>> - if (!nexthop_is_multipath(nh)) {
>> - NL_SET_ERR_MSG(extack, "Nexthop is not a multipath group");
>> + if (!nexthop_is_multipath(nh)) {
>> + NL_SET_ERR_MSG(extack, "Nexthop is not a multipath group");
>> + goto err_inval;
>> + }
>> +
>> + /* check nexthop group family */
>> + switch (vxlan->default_dst.remote_ip.sa.sa_family) {
>> + case AF_INET:
>> + if (!nexthop_has_v4(nh)) {
>> + err = -EAFNOSUPPORT;
>> + NL_SET_ERR_MSG(extack, "Nexthop group family not supported");
>> goto err_inval;
>> }
>> -
>> - /* check nexthop group family */
>> - switch (vxlan->default_dst.remote_ip.sa.sa_family) {
>> - case AF_INET:
>> - if (!nexthop_has_v4(nh)) {
>> - err = -EAFNOSUPPORT;
>> - NL_SET_ERR_MSG(extack, "Nexthop group family not supported");
>> - goto err_inval;
>> - }
>> - break;
>> - case AF_INET6:
>> - if (nexthop_has_v4(nh)) {
>> - err = -EAFNOSUPPORT;
>> - NL_SET_ERR_MSG(extack, "Nexthop group family not supported");
>> - goto err_inval;
>> - }
>> + break;
>> + case AF_INET6:
>> + if (nexthop_has_v4(nh)) {
>> + err = -EAFNOSUPPORT;
>> + NL_SET_ERR_MSG(extack, "Nexthop group family not supported");
>> + goto err_inval;
>> }
>> }
>>
>
