Merge branch 'mlxsw-Two-small-changes' (6bedc694) · Commits · 戴 / test

drivers/net/ethernet/mellanox/mlxsw/reg.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -3203,7 +3203,7 @@ MLXSW_ITEM32_INDEXED(reg, iedr, rec_type, MLXSW_REG_IEDR_BASE_LEN, 24, 8,
		* Size of entries do be deleted. The unit is 1 entry, regardless of entry type.
		* Access: OP
		*/
		MLXSW_ITEM32_INDEXED(reg, iedr, rec_size, MLXSW_REG_IEDR_BASE_LEN, 0, 11,
		MLXSW_ITEM32_INDEXED(reg, iedr, rec_size, MLXSW_REG_IEDR_BASE_LEN, 0, 13,
		MLXSW_REG_IEDR_REC_LEN, 0x00, false);

		/* reg_iedr_rec_index_start

+6 −2

Original line number	Diff line number	Diff line
		@@ -2999,6 +2999,7 @@ static u32 mlxsw_sp_nexthop_group_hash_obj(const void *data, u32 len, u32 seed)
		for (i = 0; i < nh_grp->count; i++) {
		nh = &nh_grp->nexthops[i];
		val ^= jhash(&nh->ifindex, sizeof(nh->ifindex), seed);
		val ^= jhash(&nh->gw_addr, sizeof(nh->gw_addr), seed);
		}
		return jhash(&val, sizeof(val), seed);
		default:
		@@ -3012,11 +3013,14 @@ mlxsw_sp_nexthop6_group_hash(struct mlxsw_sp_fib6_entry *fib6_entry, u32 seed)
		{
		unsigned int val = fib6_entry->nrt6;
		struct mlxsw_sp_rt6 *mlxsw_sp_rt6;
		struct net_device *dev;

		list_for_each_entry(mlxsw_sp_rt6, &fib6_entry->rt6_list, list) {
		dev = mlxsw_sp_rt6->rt->fib6_nh->fib_nh_dev;
		struct fib6_nh *fib6_nh = mlxsw_sp_rt6->rt->fib6_nh;
		struct net_device *dev = fib6_nh->fib_nh_dev;
		struct in6_addr *gw = &fib6_nh->fib_nh_gw6;

		val ^= jhash(&dev->ifindex, sizeof(dev->ifindex), seed);
		val ^= jhash(gw, sizeof(*gw), seed);
		}

		return jhash(&val, sizeof(val), seed);