Commit de3872cd authored by Yotam Gigi's avatar Yotam Gigi Committed by David S. Miller

mlxsw: spectrum: mr: Fix various endianness issues

Fix various endianness issues in comparisons and assignments. The fix is
entirely cosmetic as all the values fixed are endianness-agnostic.

Cleans up sparse warnings:
spectrum_mr.c:156:49: warning: restricted __be32 degrades to integer
spectrum_mr.c:206:26: warning: restricted __be32 degrades to integer
spectrum_mr.c:212:31: warning: incorrect type in assignment (different
  base types)
spectrum_mr.c:212:31:    expected restricted __be32 [usertype] addr4
spectrum_mr.c:212:31:    got unsigned int
spectrum_mr.c:214:32: warning: incorrect type in assignment (different
  base types)
spectrum_mr.c:214:32:    expected restricted __be32 [usertype] addr4
spectrum_mr.c:214:32:    got unsigned int
spectrum_mr.c:461:16: warning: restricted __be32 degrades to integer
spectrum_mr.c:461:49: warning: restricted __be32 degrades to integer

Fixes: c011ec1b ("mlxsw: spectrum: Add the multicast routing offloading logic")
Signed-off-by: default avatarYotam Gigi <yotamg@mellanox.com>
Signed-off-by: default avatarJiri Pirko <jiri@mellanox.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 69715dd5
...@@ -153,7 +153,7 @@ static bool mlxsw_sp_mr_route_starg(const struct mlxsw_sp_mr_route *mr_route) ...@@ -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) { switch (mr_route->mr_table->proto) {
case MLXSW_SP_L3_PROTO_IPV4: 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: case MLXSW_SP_L3_PROTO_IPV6:
/* fall through */ /* fall through */
default: default:
...@@ -203,15 +203,15 @@ static void mlxsw_sp_mr_route4_key(struct mlxsw_sp_mr_table *mr_table, ...@@ -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, struct mlxsw_sp_mr_route_key *key,
const struct mfc_cache *mfc) 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)); memset(key, 0, sizeof(*key));
key->vrid = mr_table->vr_id; key->vrid = mr_table->vr_id;
key->proto = mr_table->proto; key->proto = mr_table->proto;
key->group.addr4 = mfc->mfc_mcastgrp; 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.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, 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, ...@@ -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 /* If the route is a (*,*) route, abort, as these kind of routes are
* used for proxy routes. * 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, dev_warn(mr_table->mlxsw_sp->bus_info->dev,
"Offloading proxy routes is not supported.\n"); "Offloading proxy routes is not supported.\n");
return -EINVAL; return -EINVAL;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment