Merge tag 'mlx5-fixes-2018-12-19' of git://git.kernel.org/pub/scm/linux/kernel/git/saeed/linux (d9842f38) · Commits · 戴 / test

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

+3 −8

Original line number	Diff line number	Diff line
		@@ -1190,11 +1190,6 @@ int mlx5e_ethtool_get_ts_info(struct mlx5e_priv *priv,
		struct ethtool_ts_info *info)
		{
		struct mlx5_core_dev *mdev = priv->mdev;
		int ret;

		ret = ethtool_op_get_ts_info(priv->netdev, info);
		if (ret)
		return ret;

		info->phc_index = mlx5_clock_get_ptp_index(mdev);

		@@ -1202,7 +1197,7 @@ int mlx5e_ethtool_get_ts_info(struct mlx5e_priv *priv,
		info->phc_index == -1)
		return 0;

		info->so_timestamping \|= SOF_TIMESTAMPING_TX_HARDWARE \|
		info->so_timestamping = SOF_TIMESTAMPING_TX_HARDWARE \|
		SOF_TIMESTAMPING_RX_HARDWARE \|
		SOF_TIMESTAMPING_RAW_HARDWARE;

+6 −4

Original line number	Diff line number	Diff line
		@@ -1190,7 +1190,7 @@ mpwrq_cqe_out:
		int mlx5e_poll_rx_cq(struct mlx5e_cq *cq, int budget)
		{
		struct mlx5e_rq *rq = container_of(cq, struct mlx5e_rq, cq);
		struct mlx5e_xdpsq *xdpsq;
		struct mlx5e_xdpsq *xdpsq = &rq->xdpsq;
		struct mlx5_cqe64 *cqe;
		int work_done = 0;

		@@ -1201,10 +1201,11 @@ int mlx5e_poll_rx_cq(struct mlx5e_cq *cq, int budget)
		work_done += mlx5e_decompress_cqes_cont(rq, cq, 0, budget);

		cqe = mlx5_cqwq_get_cqe(&cq->wq);
		if (!cqe)
		if (!cqe) {
		if (unlikely(work_done))
		goto out;
		return 0;

		xdpsq = &rq->xdpsq;
		}

		do {
		if (mlx5_get_cqe_format(cqe) == MLX5_COMPRESSED) {
		@@ -1219,6 +1220,7 @@ int mlx5e_poll_rx_cq(struct mlx5e_cq *cq, int budget)
		rq->handle_rx_cqe(rq, cqe);
		} while ((++work_done < budget) && (cqe = mlx5_cqwq_get_cqe(&cq->wq)));

		out:
		if (xdpsq->doorbell) {
		mlx5e_xmit_xdp_doorbell(xdpsq);
		xdpsq->doorbell = false;

+1 −1

Original line number	Diff line number	Diff line
		@@ -452,7 +452,7 @@ static void del_sw_hw_rule(struct fs_node *node)

		if ((fte->action.action & MLX5_FLOW_CONTEXT_ACTION_FWD_DEST) &&
		--fte->dests_size) {
		modify_mask = BIT(MLX5_SET_FTE_MODIFY_ENABLE_MASK_DESTINATION_LIST),
		modify_mask = BIT(MLX5_SET_FTE_MODIFY_ENABLE_MASK_DESTINATION_LIST);
		update_fte = true;
		}
		out: