On Tue, Dec 29, 2015 at 3:24 PM, Matan Barak <mat...@mellanox.com> wrote:
> @@ -2413,34 +2442,27 @@ static int build_mlx_header(struct mlx4_ib_sqp *sqp,
> struct ib_ud_wr *wr,
>
> if (is_eth) {
> struct in6_addr in6;
> -
> + u16 ether_type;
> u16 pcp = (be32_to_cpu(ah->av.ib.sl_tclass_flowlabel) >> 29)
> << 13;
>
> + ether_type = (!is_udp) ? MLX4_IB_IBOE_ETHERTYPE :
> + (ip_version == 4 ? ETH_P_IP : ETH_P_IPV6);
> +
> mlx->sched_prio = cpu_to_be16(pcp);
>
> + ether_addr_copy(sqp->ud_header.eth.smac_h, ah->av.eth.s_mac);
> memcpy(sqp->ud_header.eth.dmac_h, ah->av.eth.mac, 6);
> - /* FIXME: cache smac value? */
> memcpy(&ctrl->srcrb_flags16[0], ah->av.eth.mac, 2);
> memcpy(&ctrl->imm, ah->av.eth.mac + 2, 4);
> memcpy(&in6, sgid.raw, sizeof(in6));
>
> - if (!mlx4_is_mfunc(to_mdev(ib_dev)->dev)) {
> - u64 mac =
> atomic64_read(&to_mdev(ib_dev)->iboe.mac[sqp->qp.port - 1]);
> - u8 smac[ETH_ALEN];
> -
> - mlx4_u64_to_smac(smac, mac);
> - memcpy(sqp->ud_header.eth.smac_h, smac, ETH_ALEN);
> - } else {
> - /* use the src mac of the tunnel */
> - memcpy(sqp->ud_header.eth.smac_h, ah->av.eth.s_mac,
> ETH_ALEN);
> - }
>
The last hunk that you removed had a role and was by no means
dead-code, right? so... (1) why it's correct to remove it? (2) if you
want to introduce different way to implement what was done here, why
in this patch? maybe add pre-patch for that
--
To unsubscribe from this list: send the line "unsubscribe linux-rdma" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
