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

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


Saeed Mahameed says:

====================
mlx5-fixes-2017-07-09

This series includes fixes to mlx5 driver:
 - Compilation warnings and issues introduced on v4.12
 - Initialize CEE's getpermhwaddr address buffer to 0xff
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents f263fbb8 d968f0f2
Loading
Loading
Loading
Loading
+2 −2
Original line number Diff line number Diff line
@@ -4,14 +4,14 @@ subdir-ccflags-y += -I$(src)
mlx5_core-y :=	main.o cmd.o debugfs.o fw.o eq.o uar.o pagealloc.o \
		health.o mcg.o cq.o srq.o alloc.o qp.o port.o mr.o pd.o \
		mad.o transobj.o vport.o sriov.o fs_cmd.o fs_core.o \
		fs_counters.o rl.o lag.o dev.o lib/gid.o
		fs_counters.o rl.o lag.o dev.o wq.o lib/gid.o

mlx5_core-$(CONFIG_MLX5_ACCEL) += accel/ipsec.o

mlx5_core-$(CONFIG_MLX5_FPGA) += fpga/cmd.o fpga/core.o fpga/conn.o fpga/sdk.o \
		fpga/ipsec.o

mlx5_core-$(CONFIG_MLX5_CORE_EN) += wq.o eswitch.o eswitch_offloads.o \
mlx5_core-$(CONFIG_MLX5_CORE_EN) += eswitch.o eswitch_offloads.o \
		en_main.o en_common.o en_fs.o en_ethtool.o en_tx.o \
		en_rx.o en_rx_am.o en_txrx.o en_clock.o vxlan.o \
		en_tc.o en_arfs.o en_rep.o en_fs_ethtool.o en_selftest.o
+1 −0
Original line number Diff line number Diff line
subdir-ccflags-y += -I$(src)/..
+1 −0
Original line number Diff line number Diff line
subdir-ccflags-y += -I$(src)/..
+3 −1
Original line number Diff line number Diff line
@@ -363,6 +363,7 @@ void mlx5e_ipsec_build_inverse_table(void)
{
	u16 mss_inv;
	u32 mss;
	u64 n;

	/* Calculate 1/x inverse table for use in GSO data path.
	 * Using this table, we provide the IPSec accelerator with the value of
@@ -372,7 +373,8 @@ void mlx5e_ipsec_build_inverse_table(void)
	 */
	mlx5e_ipsec_inverse_table[1] = htons(0xFFFF);
	for (mss = 2; mss < MAX_LSO_MSS; mss++) {
		mss_inv = ((1ULL << 32) / mss) >> 16;
		n = 1ULL << 32;
		mss_inv = do_div(n, mss) >> 16;
		mlx5e_ipsec_inverse_table[mss] = htons(mss_inv);
	}
}
+2 −0
Original line number Diff line number Diff line
@@ -464,6 +464,8 @@ static void mlx5e_dcbnl_getpermhwaddr(struct net_device *netdev,
	if (!perm_addr)
		return;

	memset(perm_addr, 0xff, MAX_ADDR_LEN);

	mlx5_query_nic_vport_mac_address(priv->mdev, 0, perm_addr);
}

Loading