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

Commit 6f3c72a2 authored by Vladislav Zolotarov's avatar Vladislav Zolotarov Committed by David S. Miller
Browse files

bnx2x: Set RXHASH for LRO packets 



Set Toeplitz hash both for LRO and none-LRO skbs.
The first CQE (TPA_START) will contain a hash for an LRO packet.

Current code sets skb->rx_hash for none-LRO skbs only.

Signed-off-by: default avatarVladislav Zolotarov <vladz@broadcom.com>
Signed-off-by: default avatarEilon Greenstein <eilong@broadcom.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 49085bd7

drivers/net/bnx2x_main.c

+21 −7
Original line number Original line Diff line number Diff line
@@ -1545,6 +1545,20 @@ static inline void bnx2x_update_rx_prod(struct bnx2x *bp, 
	   fp->index, bd_prod, rx_comp_prod, rx_sge_prod);

	   fp->index, bd_prod, rx_comp_prod, rx_sge_prod);

}

}





/* Set Toeplitz hash value in the skb using the value from the

 * CQE (calculated by HW).

 */

static inline void bnx2x_set_skb_rxhash(struct bnx2x *bp, union eth_rx_cqe *cqe,

					struct sk_buff *skb)

{

	/* Set Toeplitz hash from CQE */

	if ((bp->dev->features & NETIF_F_RXHASH) &&

	    (cqe->fast_path_cqe.status_flags &

	     ETH_FAST_PATH_RX_CQE_RSS_HASH_FLG))

		skb->rxhash =

		le32_to_cpu(cqe->fast_path_cqe.rss_hash_result);

}



static int bnx2x_rx_int(struct bnx2x_fastpath *fp, int budget)

static int bnx2x_rx_int(struct bnx2x_fastpath *fp, int budget)

{

{

	struct bnx2x *bp = fp->bp;

	struct bnx2x *bp = fp->bp;
@@ -1582,7 +1596,7 @@ static int bnx2x_rx_int(struct bnx2x_fastpath *fp, int budget) 
		struct sw_rx_bd *rx_buf = NULL;

		struct sw_rx_bd *rx_buf = NULL;

		struct sk_buff *skb;

		struct sk_buff *skb;

		union eth_rx_cqe *cqe;

		union eth_rx_cqe *cqe;

		u8 cqe_fp_flags, cqe_fp_status_flags;

		u8 cqe_fp_flags;

		u16 len, pad;

		u16 len, pad;





		comp_ring_cons = RCQ_BD(sw_comp_cons);

		comp_ring_cons = RCQ_BD(sw_comp_cons);
@@ -1598,7 +1612,6 @@ static int bnx2x_rx_int(struct bnx2x_fastpath *fp, int budget) 




		cqe = &fp->rx_comp_ring[comp_ring_cons];

		cqe = &fp->rx_comp_ring[comp_ring_cons];

		cqe_fp_flags = cqe->fast_path_cqe.type_error_flags;

		cqe_fp_flags = cqe->fast_path_cqe.type_error_flags;

		cqe_fp_status_flags = cqe->fast_path_cqe.status_flags;





		DP(NETIF_MSG_RX_STATUS, "CQE type %x  err %x  status %x"

		DP(NETIF_MSG_RX_STATUS, "CQE type %x  err %x  status %x"

		   "  queue %x  vlan %x  len %u\n", CQE_TYPE(cqe_fp_flags),

		   "  queue %x  vlan %x  len %u\n", CQE_TYPE(cqe_fp_flags),
@@ -1634,6 +1647,10 @@ static int bnx2x_rx_int(struct bnx2x_fastpath *fp, int budget) 




					bnx2x_tpa_start(fp, queue, skb,

					bnx2x_tpa_start(fp, queue, skb,

							bd_cons, bd_prod);

							bd_cons, bd_prod);



					/* Set Toeplitz hash for an LRO skb */

					bnx2x_set_skb_rxhash(bp, cqe, skb);



					goto next_rx;

					goto next_rx;

				}

				}
@@ -1726,11 +1743,8 @@ static int bnx2x_rx_int(struct bnx2x_fastpath *fp, int budget) 




			skb->protocol = eth_type_trans(skb, bp->dev);

			skb->protocol = eth_type_trans(skb, bp->dev);





			if ((bp->dev->features & NETIF_F_RXHASH) &&

			/* Set Toeplitz hash for a none-LRO skb */

			    (cqe_fp_status_flags &

			bnx2x_set_skb_rxhash(bp, cqe, skb);

			     ETH_FAST_PATH_RX_CQE_RSS_HASH_FLG))

				skb->rxhash = le32_to_cpu(

				    cqe->fast_path_cqe.rss_hash_result);





			skb->ip_summed = CHECKSUM_NONE;

			skb->ip_summed = CHECKSUM_NONE;

			if (bp->rx_csum) {

			if (bp->rx_csum) {