Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6a331e15 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'mlxsw-Various-fixes' 



Jiri Pirko says:

====================
mlxsw: Various fixes

Yotam says:

Cleanup some issues reported by sparse.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 69715dd5 ea00aa3a

drivers/net/ethernet/mellanox/mlxsw/spectrum_mr.c

+7 −6
Original line number Diff line number Diff line
@@ -153,7 +153,7 @@ static bool mlxsw_sp_mr_route_starg(const struct mlxsw_sp_mr_route *mr_route) 
{

	switch (mr_route->mr_table->proto) {

	case MLXSW_SP_L3_PROTO_IPV4:

		return mr_route->key.source_mask.addr4 == INADDR_ANY;

		return mr_route->key.source_mask.addr4 == htonl(INADDR_ANY);

	case MLXSW_SP_L3_PROTO_IPV6:

		/* fall through */

	default:
@@ -203,15 +203,15 @@ static void mlxsw_sp_mr_route4_key(struct mlxsw_sp_mr_table *mr_table, 
				   struct mlxsw_sp_mr_route_key *key,

				   const struct mfc_cache *mfc)

{

	bool starg = (mfc->mfc_origin == INADDR_ANY);

	bool starg = (mfc->mfc_origin == htonl(INADDR_ANY));



	memset(key, 0, sizeof(*key));

	key->vrid = mr_table->vr_id;

	key->proto = mr_table->proto;

	key->group.addr4 = mfc->mfc_mcastgrp;

	key->group_mask.addr4 = 0xffffffff;

	key->group_mask.addr4 = htonl(0xffffffff);

	key->source.addr4 = mfc->mfc_origin;

	key->source_mask.addr4 = starg ? 0 : 0xffffffff;

	key->source_mask.addr4 = htonl(starg ? 0 : 0xffffffff);

}



static int mlxsw_sp_mr_route_evif_link(struct mlxsw_sp_mr_route *mr_route,
@@ -458,7 +458,8 @@ int mlxsw_sp_mr_route4_add(struct mlxsw_sp_mr_table *mr_table, 
	/* If the route is a (*,*) route, abort, as these kind of routes are

	 * used for proxy routes.

	 */

	if (mfc->mfc_origin == INADDR_ANY && mfc->mfc_mcastgrp == INADDR_ANY) {

	if (mfc->mfc_origin == htonl(INADDR_ANY) &&

	    mfc->mfc_mcastgrp == htonl(INADDR_ANY)) {

		dev_warn(mr_table->mlxsw_sp->bus_info->dev,

			 "Offloading proxy routes is not supported.\n");

		return -EINVAL;
@@ -767,7 +768,7 @@ void mlxsw_sp_mr_vif_del(struct mlxsw_sp_mr_table *mr_table, vifi_t vif_index) 
	mlxsw_sp_mr_vif_unresolve(mr_table, NULL, mr_vif);

}



struct mlxsw_sp_mr_vif *

static struct mlxsw_sp_mr_vif *

mlxsw_sp_mr_dev_vif_lookup(struct mlxsw_sp_mr_table *mr_table,

			   const struct net_device *dev)

{

drivers/net/ethernet/mellanox/mlxsw/spectrum_mr_tcam.c

+1 −0
Original line number Diff line number Diff line
@@ -37,6 +37,7 @@ 
#include <linux/netdevice.h>

#include <linux/parman.h>



#include "spectrum_mr_tcam.h"

#include "reg.h"

#include "spectrum.h"

#include "core_acl_flex_actions.h"