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

Merge tag 'mlx5-updates-2020-06-23' of git://git.kernel.org/pub/scm/linux/kernel/git/saeed/linux 



Saeed Mahameed says:

====================
mlx5 updates 2020-06-23

This series adds misc cleanup and updates to mlx5 driver.

1) Misc updates and cleanup
2) Use RCU instead of spinlock for vxlan table

v1->v2:
 - Removed unnecessary Fixes Tags

v2->v3:
 - Drop "macro undefine" patch, it has no value

v3->v4:
 - Drop the Relaxed ordering patch.
====================

Reviewed-by: default avatarJakub Kicinski <kuba@kernel.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents c6d5d843 efbb974d

drivers/net/ethernet/mellanox/mlx5/core/en/rep/neigh.c

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

#include <linux/notifier.h>

#include <net/netevent.h>

#include <net/arp.h>

#include "neigh.h"

#include "tc.h"

#include "en_rep.h"

drivers/net/ethernet/mellanox/mlx5/core/en/xsk/umem.c

+0 −13
Original line number Diff line number Diff line
@@ -215,16 +215,3 @@ int mlx5e_xsk_setup_umem(struct net_device *dev, struct xdp_umem *umem, u16 qid) 
	return umem ? mlx5e_xsk_enable_umem(priv, umem, ix) :

		      mlx5e_xsk_disable_umem(priv, ix);

}
 


u16 mlx5e_xsk_first_unused_channel(struct mlx5e_params *params, struct mlx5e_xsk *xsk)

{

	u16 res = xsk->refcnt ? params->num_channels : 0;



	while (res) {

		if (mlx5e_xsk_get_umem(params, xsk, res - 1))

			break;

		--res;

	}



	return res;

}

drivers/net/ethernet/mellanox/mlx5/core/en/xsk/umem.h

+0 −2
Original line number Diff line number Diff line
@@ -26,6 +26,4 @@ int mlx5e_xsk_setup_umem(struct net_device *dev, struct xdp_umem *umem, u16 qid) 


int mlx5e_xsk_resize_reuseq(struct xdp_umem *umem, u32 nentries);



u16 mlx5e_xsk_first_unused_channel(struct mlx5e_params *params, struct mlx5e_xsk *xsk);



#endif /* __MLX5_EN_XSK_UMEM_H__ */

drivers/net/ethernet/mellanox/mlx5/core/en_arfs.c

+1 −1
Original line number Diff line number Diff line
@@ -220,7 +220,7 @@ static int arfs_create_groups(struct mlx5e_flow_table *ft, 
			sizeof(*ft->g), GFP_KERNEL);

	in = kvzalloc(inlen, GFP_KERNEL);

	if  (!in || !ft->g) {

		kvfree(ft->g);

		kfree(ft->g);

		kvfree(in);

		return -ENOMEM;

	}

drivers/net/ethernet/mellanox/mlx5/core/en_rep.c

+0 −1
Original line number Diff line number Diff line
@@ -35,7 +35,6 @@ 
#include <net/switchdev.h>

#include <net/pkt_cls.h>

#include <net/act_api.h>

#include <net/arp.h>

#include <net/devlink.h>

#include <net/ipv6_stubs.h>

CRA Git | Maintained and supported by SUSTech CRA and CCSE